linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #03885
[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2491: build fixes
------------------------------------------------------------
revno: 2491
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2011-04-15 22:53:17 +0200
message:
build fixes
modified:
SConstruct
dcpp/BZUtils.cpp
dcpp/BZUtils.h
dcpp/BufferedSocket.h
dcpp/CID.h
dcpp/CryptoManager.cpp
dcpp/Encoder.cpp
dcpp/SSL.h
dcpp/TigerHash.cpp
dcpp/TigerHash.h
dcpp/Util.cpp
dcpp/Util.h
dcpp/ZUtils.h
dcpp/debug.h
dcpp/stdinc.h
dcpp/typedefs.h
dwt/include/dwt/Application.h
msvc/atomic
win32/FavHubsFrame.cpp
win32/MainWindow.cpp
win32/SConscript
win32/SettingsDialog.cpp
win32/SpyFrame.cpp
win32/UsersFrame.cpp
--
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 2011-02-11 23:08:25 +0000
+++ SConstruct 2011-04-15 20:53:17 +0000
@@ -55,7 +55,7 @@
}
msvc_defs = {
- 'common' : ['_REENTRANT'],
+ 'common' : ['_REENTRANT', 'snprintf=_snprintf'],
'debug' : ['_DEBUG', '_HAS_ITERATOR_DEBUGGING=0', '_SECURE_SCL=0'],
'release' : ['NDEBUG']
}
=== modified file 'dcpp/BZUtils.cpp'
--- dcpp/BZUtils.cpp 2011-04-13 19:16:51 +0000
+++ dcpp/BZUtils.cpp 2011-04-15 20:53:17 +0000
@@ -19,8 +19,6 @@
#include "stdinc.h"
#include "BZUtils.h"
-#include <algorithm>
-
#include "Exception.h"
#include "format.h"
=== modified file 'dcpp/BZUtils.h'
--- dcpp/BZUtils.h 2011-01-02 17:12:02 +0000
+++ dcpp/BZUtils.h 2011-04-15 20:53:17 +0000
@@ -16,14 +16,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#if !defined(BZ_UTILS_H)
-#define BZ_UTILS_H
+#ifndef DCPLUSPLUS_DCPP_BZUTILS_H
+#define DCPLUSPLUS_DCPP_BZUTILS_H
-#ifdef _WIN32
-#include "../bzip2/bzlib.h"
-#else
#include <bzlib.h>
-#endif
namespace dcpp {
@@ -63,4 +59,4 @@
} // namespace dcpp
-#endif // !defined(BZ_UTILS_H)
+#endif // !defined(DCPLUSPLUS_DCPP_BZUTILS_H)
=== modified file 'dcpp/BufferedSocket.h'
--- dcpp/BufferedSocket.h 2011-04-15 18:41:30 +0000
+++ dcpp/BufferedSocket.h 2011-04-15 20:53:17 +0000
@@ -33,10 +33,10 @@
namespace dcpp {
+using std::atomic;
using std::deque;
using std::pair;
using std::unique_ptr;
-using std::atomic;
class BufferedSocket : public Speaker<BufferedSocketListener>, private Thread {
public:
=== modified file 'dcpp/CID.h'
--- dcpp/CID.h 2011-04-13 19:16:51 +0000
+++ dcpp/CID.h 2011-04-15 20:53:17 +0000
@@ -19,7 +19,7 @@
#ifndef DCPLUSPLUS_DCPP_CID_H
#define DCPLUSPLUS_DCPP_CID_H
-#include <string.h>
+#include <cstring>
#include <algorithm>
#include "Encoder.h"
=== modified file 'dcpp/CryptoManager.cpp'
--- dcpp/CryptoManager.cpp 2011-04-13 19:16:51 +0000
+++ dcpp/CryptoManager.cpp 2011-04-15 20:53:17 +0000
@@ -28,12 +28,6 @@
#include <openssl/bn.h>
-#ifdef _WIN32
-#include "../bzip2/bzlib.h"
-#else
-#include <bzlib.h>
-#endif
-
namespace dcpp {
=== modified file 'dcpp/Encoder.cpp'
--- dcpp/Encoder.cpp 2011-04-13 19:16:51 +0000
+++ dcpp/Encoder.cpp 2011-04-15 20:53:17 +0000
@@ -19,7 +19,7 @@
#include "stdinc.h"
#include "Encoder.h"
-#include <string.h>
+#include <cstring>
#include "debug.h"
=== modified file 'dcpp/SSL.h'
--- dcpp/SSL.h 2011-04-13 19:16:51 +0000
+++ dcpp/SSL.h 2011-04-15 20:53:17 +0000
@@ -3,7 +3,6 @@
#include <openssl/ssl.h>
-#include <stdint.h>
#include <vector>
namespace dcpp {
=== modified file 'dcpp/TigerHash.cpp'
--- dcpp/TigerHash.cpp 2011-04-13 19:16:51 +0000
+++ dcpp/TigerHash.cpp 2011-04-15 20:53:17 +0000
@@ -32,9 +32,7 @@
#include "stdinc.h"
#include "TigerHash.h"
-#include <algorithm>
#include <boost/detail/endian.hpp>
-#include <string.h>
#include "debug.h"
=== modified file 'dcpp/TigerHash.h'
--- dcpp/TigerHash.h 2011-04-13 19:16:51 +0000
+++ dcpp/TigerHash.h 2011-04-15 20:53:17 +0000
@@ -32,8 +32,8 @@
#ifndef DCPLUSPLUS_DCPP_TIGER_HASH_H
#define DCPLUSPLUS_DCPP_TIGER_HASH_H
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
namespace dcpp {
=== modified file 'dcpp/Util.cpp'
--- dcpp/Util.cpp 2011-04-13 19:16:51 +0000
+++ dcpp/Util.cpp 2011-04-15 20:53:17 +0000
@@ -42,10 +42,10 @@
#include <arpa/inet.h>
#include <netdb.h>
#include <sys/utsname.h>
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
#endif
-#include <locale.h>
+#include <clocale>
namespace dcpp {
=== modified file 'dcpp/Util.h'
--- dcpp/Util.h 2011-04-13 19:16:51 +0000
+++ dcpp/Util.h 2011-04-15 20:53:17 +0000
@@ -21,15 +21,13 @@
#include "compiler.h"
-#include <stdlib.h>
-#include <time.h>
+#include <cstdlib>
+#include <ctime>
#include <map>
#include <boost/range/algorithm/find_if.hpp>
-#include "compiler.h"
-
#ifdef _WIN32
# define PATH_SEPARATOR '\\'
@@ -42,7 +40,7 @@
#include <sys/stat.h>
#include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
#endif
=== modified file 'dcpp/ZUtils.h'
--- dcpp/ZUtils.h 2011-04-13 19:16:51 +0000
+++ dcpp/ZUtils.h 2011-04-15 20:53:17 +0000
@@ -19,14 +19,10 @@
#ifndef DCPLUSPLUS_DCPP_Z_UTILS_H
#define DCPLUSPLUS_DCPP_Z_UTILS_H
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
-#ifdef _WIN32
-#include "../zlib/zlib.h"
-#else
#include <zlib.h>
-#endif
namespace dcpp {
=== modified file 'dcpp/debug.h'
--- dcpp/debug.h 2011-04-13 19:16:51 +0000
+++ dcpp/debug.h 2011-04-15 20:53:17 +0000
@@ -19,11 +19,11 @@
#ifndef DCPP_DCPLUSPLUS_DEBUG_H_
#define DCPP_DCPLUSPLUS_DEBUG_H_
-#include <stdio.h>
+#include <cstdio>
#ifdef _DEBUG
-#include <assert.h>
+#include <cassert>
#define dcdebug printf
#ifdef _MSC_VER
=== modified file 'dcpp/stdinc.h'
--- dcpp/stdinc.h 2011-04-13 19:16:51 +0000
+++ dcpp/stdinc.h 2011-04-15 20:53:17 +0000
@@ -29,10 +29,8 @@
#ifdef _WIN32
#include "w.h"
-#include "../bzip2/bzlib.h"
#else
#include <arpa/inet.h>
-#include <bzlib.h>
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
@@ -42,7 +40,6 @@
#include <pthread.h>
#include <sched.h>
#include <semaphore.h>
-#include <stdlib.h>
#include <sys/ioctl.h>
#include <sys/resource.h>
#include <sys/socket.h>
@@ -51,10 +48,11 @@
#include <unistd.h>
#endif
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
#include <algorithm>
#include <atomic>
@@ -81,7 +79,8 @@
#include <boost/thread/recursive_mutex.hpp>
#include <boost/variant.hpp>
-#include <time.h>
+#include <bzlib.h>
+
#include <openssl/ssl.h>
#endif
=== modified file 'dcpp/typedefs.h'
--- dcpp/typedefs.h 2011-04-13 19:16:51 +0000
+++ dcpp/typedefs.h 2011-04-15 20:53:17 +0000
@@ -21,7 +21,7 @@
#include "forward.h"
-#include <stdint.h>
+#include <cstdint>
#include <string>
#include <unordered_map>
=== modified file 'dwt/include/dwt/Application.h'
--- dwt/include/dwt/Application.h 2011-01-02 17:12:02 +0000
+++ dwt/include/dwt/Application.h 2011-04-15 20:53:17 +0000
@@ -46,7 +46,7 @@
#ifdef _DEBUG
// Enable memory leak detection with file/line tracing.
#define _CRTDBG_MAP_ALLOC
-#include <stdlib.h>
+#include <cstdlib>
#include <crtdbg.h>
#endif
#endif
=== modified file 'msvc/atomic'
--- msvc/atomic 2010-09-01 18:36:57 +0000
+++ msvc/atomic 2011-04-15 20:53:17 +0000
@@ -3,7 +3,9 @@
#include <boost/atomic.hpp>
-using boost::atomic;
-using boost::atomic_flag;
+namespace std {
+ using boost::atomic;
+ using boost::atomic_flag;
+}
// vim: set filetype=cpp :
=== modified file 'win32/FavHubsFrame.cpp'
--- win32/FavHubsFrame.cpp 2011-04-05 19:16:53 +0000
+++ win32/FavHubsFrame.cpp 2011-04-15 20:53:17 +0000
@@ -29,6 +29,7 @@
#include "FavHubProperties.h"
#include "FavHubGroupsDlg.h"
+using std::for_each;
using std::set;
using std::swap;
=== modified file 'win32/MainWindow.cpp'
--- win32/MainWindow.cpp 2011-04-07 13:40:55 +0000
+++ win32/MainWindow.cpp 2011-04-15 20:53:17 +0000
@@ -149,7 +149,7 @@
onClosing([this] { return handleClosing(); });
- onRaw([this](WPARAM w, LPARAM l) { return handleActivateApp(w); }, dwt::Message(WM_ACTIVATEAPP));
+ onRaw([this](WPARAM w, LPARAM) { return handleActivateApp(w); }, dwt::Message(WM_ACTIVATEAPP));
onRaw([this](WPARAM, LPARAM) { return handleEndSession(); }, dwt::Message(WM_ENDSESSION));
onRaw([this](WPARAM, LPARAM l) { return handleCopyData(l); }, dwt::Message(WM_COPYDATA));
onRaw([this](WPARAM, LPARAM) { return handleWhereAreYou(); }, dwt::Message(SingleInstance::WMU_WHERE_ARE_YOU));
=== modified file 'win32/SConscript'
--- win32/SConscript 2011-02-11 23:08:25 +0000
+++ win32/SConscript 2011-04-15 20:53:17 +0000
@@ -17,7 +17,7 @@
env.Append(LIBS = ['comctl32', 'ws2_32', 'ole32', 'gdi32', 'comdlg32', 'iphlpapi', 'winmm', 'shlwapi', 'oleaut32', 'uuid'])
-env.Append(CPPPATH = ['#/openssl/include', '#/miniupnpc', '#/dwt/include'])
+env.Append(CPPPATH = ['#/openssl/include', '#/bzip2', '#/zlib', '#/miniupnpc', '#/dwt/include'])
openssl_lib = '#/openssl/lib/'
if env['arch'] != 'x86':
=== modified file 'win32/SettingsDialog.cpp'
--- win32/SettingsDialog.cpp 2011-04-13 19:16:51 +0000
+++ win32/SettingsDialog.cpp 2011-04-15 20:53:17 +0000
@@ -126,7 +126,7 @@
auto addPage = [this, container, setting](const tstring& title, PropPage* page, HTREEITEM parent) -> HTREEITEM {
auto ret = tree->insert(title, parent, reinterpret_cast<LPARAM>(page), true);
if(pages.size() == setting)
- GCC_WTF->callAsync([=] { GCC_WTF->tree->setSelected(ret); });
+ GCC_WTF->callAsync([=] { tree->setSelected(ret); });
pages.push_back(page);
return ret;
};
=== modified file 'win32/SpyFrame.cpp'
--- win32/SpyFrame.cpp 2011-04-05 19:16:53 +0000
+++ win32/SpyFrame.cpp 2011-04-15 20:53:17 +0000
@@ -21,6 +21,8 @@
#include "SpyFrame.h"
+#include <numeric>
+
#include <dcpp/format.h>
#include <dcpp/ShareManager.h>
#include <dcpp/ClientManager.h>
=== modified file 'win32/UsersFrame.cpp'
--- win32/UsersFrame.cpp 2011-04-05 19:16:53 +0000
+++ win32/UsersFrame.cpp 2011-04-15 20:53:17 +0000
@@ -34,6 +34,8 @@
#include <dwt/widgets/ScrolledContainer.h>
#include <dwt/widgets/SplitterContainer.h>
+using std::for_each;
+
const string UsersFrame::id = "Users";
const string& UsersFrame::getId() const { return id; }
