Fixes for gcc-4.7.1 compilation

g++-4.7.1 treats "FOO"bar as a c++-11 literal operator, even
if bar is a macro with an expansion such as "BAR" - so add a space
after the quote (this seems like a bug, and I fixed a bunch of these
a while ago, but we just added a slew of PRI*64 macros which break
under 4.7.1).

Also, it warned that "explicit by-copy capture of 'this' redundant"
for a lambda declared [=, this] - so I removed the this.

We also needed more than the 60 levels of template expansion that was
allowed by the makefile.
Esse commit está contido em:
mwilliams
2013-02-10 12:05:15 -08:00
commit de Sara Golemon
commit 1bc06a26cf
40 arquivos alterados com 162 adições e 162 exclusões
+3 -3
Ver Arquivo
@@ -187,7 +187,7 @@ void HphpArray::dumpDebugInfo() const {
uintptr_t(this));
fprintf(stderr, "m_data = %p\tm_hash = %p\n"
"m_tableMask = %u\tm_size = %d\tm_hLoad = %d\n"
"m_nextKI = %"PRId64"\t\tm_lastE = %d\tm_pos = %zd\n",
"m_nextKI = %" PRId64 "\t\tm_lastE = %d\tm_pos = %zd\n",
m_data, m_hash, m_tableMask, m_size, m_hLoad,
m_nextKI, m_lastE, m_pos);
fprintf(stderr, "Elements:\n");
@@ -204,7 +204,7 @@ void HphpArray::dumpDebugInfo() const {
fprintf(stderr, " [%3d] hash=0x%016x key=\"%s\" data=(%.*s)\n",
int(i), elms[i].hash, k.data(), s.size()-1, s.data());
} else {
fprintf(stderr, " [%3d] ind=%"PRId64" data.m_type=(%.*s)\n", int(i),
fprintf(stderr, " [%3d] ind=%" PRId64 " data.m_type=(%.*s)\n", int(i),
elms[i].ikey, s.size()-1, s.data());
}
} else {
@@ -1887,7 +1887,7 @@ ArrayData*
array_getm_i(void* dptr, int64 key, TypedValue* out) {
assert(dptr);
ArrayData* ad = (ArrayData*)dptr;
TRACE(2, "array_getm_ik1: (%p) <- %p[%"PRId64"]\n", out, dptr, key);
TRACE(2, "array_getm_ik1: (%p) <- %p[%" PRId64 "]\n", out, dptr, key);
// Ref-counting the value is the translator's responsibility. We know out
// pointed to uninitialized memory, so no need to dec it.
TypedValue* ret = ad->nvGetCell(key);