linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2385
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2011-01-09 22:22:07 +0100
message:
  mingw build fix
modified:
  SConstruct
  win32/StaticFrame.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'SConstruct'
--- SConstruct	2010-12-18 16:42:12 +0000
+++ SConstruct	2011-01-09 21:22:07 +0000
@@ -149,6 +149,7 @@
 		env.Append(CCFLAGS = ['-pipe'])
 
 # MinGW seems to choke on member function calls from lambdas, one has to add "this->".
+# bug report: <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47169>
 # TODO When versions of GCC for MinGW that don't need this workaround are available, remove any
 # mention of "GCC_WTF". Until then, use it to facilitate search & replace.
 env.Append(CPPDEFINES = ['GCC_WTF="this"'])

=== modified file 'win32/StaticFrame.h'
--- win32/StaticFrame.h	2011-01-09 14:54:10 +0000
+++ win32/StaticFrame.h	2011-01-09 21:22:07 +0000
@@ -25,6 +25,8 @@
 
 template<class T>
 class StaticFrame : public MDIChildFrame<T> {
+	typedef MDIChildFrame<T> BaseType;
+
 public:
 	StaticFrame(TabViewPtr parent, const tstring& title, unsigned helpId, unsigned iconId, bool manageAccels = true) :
 		MDIChildFrame<T>(parent, title, helpId, iconId, manageAccels)
@@ -52,7 +54,7 @@
 	}
 
 	static void parseWindowParams(TabViewPtr parent, const StringMap& params) {
-		openWindow(parent, false, parseActivateParam(params));
+		openWindow(parent, false, BaseType::parseActivateParam(params));
 	}
 
 private: