Remove obsolete Boost macros

FranciscoDA · Mar 17, 2019 · caa20a7 · caa20a7
1 parent 7cb225b
commit caa20a7
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 28 deletions.
diff --git a/framework/apocresources/apocfont.cpp b/framework/apocresources/apocfont.cpp
@@ -7,9 +7,6 @@
 #include "framework/trace.h"
 #include "library/sp.h"
 
-// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost
-// symbols as part of the module that uses it
-#define BOOST_ALL_NO_LIB
 #include <boost/locale.hpp>
 
 namespace OpenApoc

diff --git a/framework/configfile.cpp b/framework/configfile.cpp
@@ -12,9 +12,6 @@
 #include <string>
 #include <variant>
 
-// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost
-// symbols as part of the module that uses it
-#define BOOST_ALL_NO_LIB
 #include <boost/program_options.hpp>
 
 namespace po = boost::program_options;

diff --git a/framework/framework.cpp b/framework/framework.cpp
@@ -31,9 +31,6 @@
 #include <physfs.h>
 
 // Boost locale for setting the system locale
-// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost
-// symbols as part of the module that uses it
-#define BOOST_ALL_NO_LIB
 #include <boost/locale.hpp>
 
 using namespace OpenApoc;

diff --git a/framework/logger.cpp b/framework/logger.cpp
@@ -1,7 +1,6 @@
-#ifdef _WIN32 // Seems to be set even on win64?
+#ifdef _WIN32
 #define BACKTRACE_WINDOWS
 #define _CRT_SECURE_NO_WARNINGS
-#define ERROR_DIALOG
 #endif
 
 #include "framework/logger.h"

diff --git a/framework/serialization/providers/providerwithchecksum.cpp b/framework/serialization/providers/providerwithchecksum.cpp
@@ -9,9 +9,6 @@
 
 #include "dependencies/pugixml/src/pugixml.hpp"
 
-// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost
-// symbols as part of the module that uses it
-#define BOOST_ALL_NO_LIB
 #include <boost/crc.hpp>
 #include <boost/version.hpp>
 #if BOOST_VERSION >= 106600

diff --git a/game/state/gametime.cpp b/game/state/gametime.cpp
@@ -4,9 +4,6 @@
 #include <locale>
 #include <sstream>
 
-// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost
-// symbols as part of the module that uses it
-#define BOOST_ALL_NO_LIB
 #include <boost/date_time.hpp>
 
 // for my sake

diff --git a/game/state/gametime_facet.h b/game/state/gametime_facet.h
@@ -1,8 +1,5 @@
 #pragma once
 
-// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost
-// symbols as part of the module that uses it
-#define BOOST_ALL_NO_LIB
 #include <boost/date_time.hpp>
 #include <boost/date_time/date_facet.hpp>
 

diff --git a/game/state/savemanager.cpp b/game/state/savemanager.cpp
@@ -9,10 +9,6 @@
 #include <algorithm>
 #include <sstream>
 
-// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost
-// symbols as part of the module that uses it
-#define BOOST_ALL_NO_LIB
-
 // boost uuid for generating temporary identifier for new save
 #include <boost/uuid/uuid_generators.hpp> // generators
 #include <boost/uuid/uuid_io.hpp>         // conversion to string

diff --git a/library/strings.cpp b/library/strings.cpp
@@ -2,9 +2,7 @@
 #include "library/strings_format.h"
 #include <cctype>
 #include <tuple> // used for std::ignore
-// Disable automatic #pragma linking for boost - only enabled in msvc and that should provide boost
-// symbols as part of the module that uses it
-#define BOOST_ALL_NO_LIB
+
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/locale/message.hpp>
 

diff --git a/tools/code_generators/serialization_xml.h b/tools/code_generators/serialization_xml.h
@@ -7,7 +7,6 @@
 #include <list>
 #include <vector>
 
-#define BOOST_ALL_NO_LIB
 #include <boost/program_options.hpp>
 #include <boost/version.hpp>
 #if BOOST_VERSION >= 106600