tags 668698 + patch
thanks
diff -Nru cxxtools-2.0/debian/changelog cxxtools-2.0/debian/changelog
--- cxxtools-2.0/debian/changelog 2011-12-06 22:16:52.000000000 +0000
+++ cxxtools-2.0/debian/changelog 2012-04-14 17:09:03.000000000 +0000
@@ -1,3 +1,9 @@
+cxxtools (2.0-4.1) unstable; urgency=low
+
+ * Fix build failure with gcc-4.7. Closes: #668698.
+
+ -- Matthias Klose <d...@debian.org> Sat, 14 Apr 2012 19:08:15 +0200
+
cxxtools (2.0-4) unstable; urgency=low
* Add atomictype=pthread on armhf too.
diff -Nru cxxtools-2.0/debian/patches/gcc4.7_ftbfs_fix
cxxtools-2.0/debian/patches/gcc4.7_ftbfs_fix
--- cxxtools-2.0/debian/patches/gcc4.7_ftbfs_fix 1970-01-01
00:00:00.000000000 +0000
+++ cxxtools-2.0/debian/patches/gcc4.7_ftbfs_fix 2012-04-14
17:09:54.000000000 +0000
@@ -0,0 +1,108 @@
+--- cxxtools-2.0.orig/include/cxxtools/textstream.h
++++ cxxtools-2.0/include/cxxtools/textstream.h
+@@ -84,14 +84,14 @@ class BasicTextIStream : public std::bas
+ : std::basic_istream<intern_type>(0)
+ , _buffer( &is, codec )
+ {
+- init(&_buffer);
++ this->init(&_buffer);
+ }
+
+ explicit BasicTextIStream(CodecType* codec)
+ : std::basic_istream<intern_type>(0)
+ , _buffer( 0, codec )
+ {
+- init(&_buffer);
++ this->init(&_buffer);
+ }
+
+ //! @brief Deletes to codec.
+@@ -170,12 +170,12 @@ class BasicTextOStream : public std::bas
+ BasicTextOStream(StreamType& os, CodecType* codec)
+ : std::basic_ostream<intern_type>(0)
+ , _buffer( &os , codec )
+- { init(&_buffer); }
++ { this->init(&_buffer); }
+
+ explicit BasicTextOStream(CodecType* codec)
+ : std::basic_ostream<intern_type>(0)
+ , _buffer( 0 , codec )
+- { init(&_buffer); }
++ { this->init(&_buffer); }
+
+ //! @brief Deletes to codec.
+ ~BasicTextOStream()
+@@ -253,12 +253,12 @@ class BasicTextStream : public std::basi
+ BasicTextStream(StreamType& ios, CodecType* codec)
+ : std::basic_iostream<intern_type>(0)
+ , _buffer( &ios, codec)
+- { init(&_buffer); }
++ { this->init(&_buffer); }
+
+ explicit BasicTextStream(CodecType* codec)
+ : std::basic_iostream<intern_type>(0)
+ , _buffer(0, codec)
+- { init(&_buffer); }
++ { this->init(&_buffer); }
+
+ //! @brief Deletes the codec.
+ ~BasicTextStream()
+--- cxxtools-2.0.orig/include/cxxtools/smartptr.h
++++ cxxtools-2.0/include/cxxtools/smartptr.h
+@@ -249,14 +249,14 @@ namespace cxxtools
+ { ownershipPolicyType::link(ptr, ptr.object); }
+ ~SmartPtr()
+ { if (ownershipPolicyType::unlink(object))
+- destroy(object); }
++ this->destroy(object); }
+
+ SmartPtr& operator= (const SmartPtr& ptr)
+ {
+ if (object != ptr.object)
+ {
+ if (ownershipPolicyType::unlink(object))
+- destroy(object);
++ this->destroy(object);
+
+ object = ptr.object;
+
+--- cxxtools-2.0.orig/include/cxxtools/iostream.h
++++ cxxtools-2.0/include/cxxtools/iostream.h
+@@ -56,7 +56,7 @@ class BasicIStream : public std::basic_i
+ {
+ BasicStreamBuffer<CharT>* tmp = _buffer;
+ _buffer = buffer;
+- rdbuf(buffer);
++ this->rdbuf(buffer);
+ return tmp;
+ }
+
+@@ -106,7 +106,7 @@ class BasicOStream : public std::basic_o
+ {
+ BasicStreamBuffer<CharT>* tmp = _buffer;
+ _buffer = buffer;
+- rdbuf(buffer);
++ this->rdbuf(buffer);
+ return tmp;
+ }
+
+@@ -152,7 +152,7 @@ class BasicIOStream : public std::basic_
+ {
+ BasicStreamBuffer<CharT>* tmp = _buffer;
+ _buffer = buffer;
+- rdbuf(buffer);
++ this->rdbuf(buffer);
+ return tmp;
+ }
+
+--- cxxtools-2.0.orig/include/cxxtools/streamcounter.h
++++ cxxtools-2.0/include/cxxtools/streamcounter.h
+@@ -69,7 +69,7 @@ namespace cxxtools
+ BasicStreamcounter()
+ : std::basic_ostream<CharType, Traits>(0)
+ {
+- init(&streambuf);
++ this->init(&streambuf);
+ }
+
+ unsigned getCount() const { return streambuf.getCount(); }
diff -Nru cxxtools-2.0/debian/patches/series cxxtools-2.0/debian/patches/series
--- cxxtools-2.0/debian/patches/series 2011-12-06 20:02:57.000000000 +0000
+++ cxxtools-2.0/debian/patches/series 2012-04-14 17:10:08.000000000 +0000
@@ -4,3 +4,4 @@
configure.in_fix
arm_gcc4.6_ftbfs_fix
hurd_fake_PATH_MAX
+gcc4.7_ftbfs_fix
