linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #04862
[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2696: fix GCC build
------------------------------------------------------------
revno: 2696
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2011-12-04 16:13:29 +0100
message:
fix GCC build
modified:
dcpp/UserMatchManager.cpp
win32/SettingsDialog.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 'dcpp/UserMatchManager.cpp'
--- dcpp/UserMatchManager.cpp 2011-12-04 14:56:09 +0000
+++ dcpp/UserMatchManager.cpp 2011-12-04 15:13:29 +0000
@@ -46,7 +46,12 @@
auto lock = cm->lock();
// swap the new list.
+#ifdef __GNUC__ /// @todo GCC doesn't seem to support vector swapping to an rvalue ref...
+ auto& lvalueList = newList;
+ const_cast<UserMatches&>(list).swap(lvalueList);
+#else
const_cast<UserMatches&>(list).swap(std::forward<UserMatches>(newList));
+#endif
// refresh user matches.
auto& users = cm->getOnlineUsers();
=== modified file 'win32/SettingsDialog.h'
--- win32/SettingsDialog.h 2011-12-03 21:53:57 +0000
+++ win32/SettingsDialog.h 2011-12-04 15:13:29 +0000
@@ -19,6 +19,8 @@
#ifndef DCPLUSPLUS_WIN32_SETTINGS_DIALOG_H
#define DCPLUSPLUS_WIN32_SETTINGS_DIALOG_H
+#include <dcpp/debug.h>
+
#include <dwt/widgets/ModalDialog.h>
#include <dwt/widgets/Tree.h>