control 672013 patch
stop
On Di, Mai 22, 2012 at 11:08:11 (CEST), Reinhard Tartler wrote:
> As short-term solution, I think I could work around this by adding
> -fpermissive to the CFLAGS, but at the end of the day, a proper solution
> is of course favorable. According to Matthias, adding appropriate this->
> qualifier should do the trick.
I've come up with this patch (test compiled on faui48d with g++-4.7):
Index: src/basics/BCStack.h
===================================================================
--- src/basics/BCStack.h (revision 741)
+++ src/basics/BCStack.h (working copy)
@@ -40,7 +40,7 @@
if (_tos)
++_tos;
if (! _tos)
- _tos = add (item);
+ _tos = this->add (item);
else
*_tos = item;
_length++;
Index: src/basics/PtrStack.h
===================================================================
--- src/basics/PtrStack.h (revision 741)
+++ src/basics/PtrStack.h (working copy)
@@ -103,7 +103,7 @@
template <class T>
inline void PtrStack<T>::Push (const T *item) {
- append ((T*)item);
+ this->append ((T*)item);
}
template <class T>
Index: src/scanner/LexerMap.h
===================================================================
--- src/scanner/LexerMap.h (revision 741)
+++ src/scanner/LexerMap.h (working copy)
@@ -32,7 +32,7 @@
delete i->second;
}
Iter create (unsigned id) {
- return insert (ValueType (id, new L)).first;
+ return this->insert (ValueType (id, new L)).first;
}
};
Olaf, with your permission, I'm going to commit this to SVN tonight, OK?
Cheers,
Reinhard
--
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
