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:
@@ -322,11 +322,11 @@ bool ArrayData::setFullPos(const FullPos &fp) {
|
||||
assert(fp.getContainer() == (ArrayData*)this);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
void ArrayData::nextForFullPos() {
|
||||
next();
|
||||
}
|
||||
|
||||
|
||||
void ArrayData::freeStrongIterators() {
|
||||
for (FullPosRange r(strongIterators()); !r.empty(); r.popFront()) {
|
||||
r.front()->setContainer(NULL);
|
||||
@@ -561,7 +561,7 @@ TypedValue* ArrayData::nvGetCell(const StringData* key) const {
|
||||
}
|
||||
|
||||
CVarRef ArrayData::getNotFound(int64 k) {
|
||||
raise_notice("Undefined index: %"PRId64, k);
|
||||
raise_notice("Undefined index: %" PRId64, k);
|
||||
return null_variant;
|
||||
}
|
||||
|
||||
@@ -586,7 +586,7 @@ CVarRef ArrayData::getNotFound(CVarRef k) {
|
||||
}
|
||||
|
||||
TypedValue* ArrayData::nvGetNotFound(int64 k) {
|
||||
raise_notice("Undefined index: %"PRId64, k);
|
||||
raise_notice("Undefined index: %" PRId64, k);
|
||||
return (TypedValue*)&init_null_variant;
|
||||
}
|
||||
|
||||
|
||||
Referência em uma Nova Issue
Bloquear um usuário