summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-04-05 13:17:19 (GMT)
committerTobias Markmann <tm@ayena.de>2016-04-05 19:42:39 (GMT)
commit2b560b129b7a31fc8cc07f618e763c95a22bf832 (patch)
tree73e72cdc758b79d01485dc28dcedd48b26859ae8 /3rdParty/Boost/SConscript
parent3c560e31b0f168da917e8d566db01fd1cd997d86 (diff)
downloadswift-2b560b129b7a31fc8cc07f618e763c95a22bf832.zip
swift-2b560b129b7a31fc8cc07f618e763c95a22bf832.tar.bz2
Migrate to Boost.Signals2 from Boost.Signals
Boost.Signals was deprecated and is not improved further. This patch removes Boost.Signals from 3rdParty and adds Boost.Signals2 and its dependencies. Also removed the Qt signals compatibility file Swiften/Base/boost_bsignals.h. Test-Information: Build and ran unit tests on OS X 10.11.4. Confirmed successful login using Swift client. Change-Id: Ie6e3b2d15aac2462cda95401582f5287a479fb54
Diffstat (limited to '3rdParty/Boost/SConscript')
-rw-r--r--3rdParty/Boost/SConscript7
1 files changed, 1 insertions, 6 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript
index b3ed153..6172777 100644
--- a/3rdParty/Boost/SConscript
+++ b/3rdParty/Boost/SConscript
@@ -37,7 +37,7 @@ elif env.get("BOOST_BUNDLED", False) :
if env["SCONS_STAGE"] == "flags" :
env["BOOST_FLAGS"] = {
"CPPFLAGS": cppflags,
- "CPPDEFINES": cppdefines + ['BOOST_SIGNALS_NO_DEPRECATION_WARNING'],
+ "CPPDEFINES": cppdefines,
"LIBPATH": [Dir(".")],
"LIBS": ["Swiften_Boost"]
}
@@ -70,11 +70,6 @@ elif env.get("BOOST_BUNDLED", False) :
"src/libs/date_time/src/posix_time/posix_time_types.cpp",
"src/libs/system/src/error_code.cpp",
"src/libs/thread/src/tss_null.cpp",
- "src/libs/signals/src/connection.cpp",
- "src/libs/signals/src/named_slot_map.cpp",
- "src/libs/signals/src/signal_base.cpp",
- "src/libs/signals/src/slot.cpp",
- "src/libs/signals/src/trackable.cpp",
"src/libs/filesystem/src/codecvt_error_category.cpp",
"src/libs/filesystem/src/operations.cpp",
"src/libs/filesystem/src/path.cpp",