Suppress large amounts of 'BOOST_NO_CXX98_FUNCTION_BASE macro redefined' warnings in clang/emcc builds (#7747)

Code/GraphMol/CIPLabeler/CIPLabeler.h

@@ -10,7 +10,9 @@
 //
 #pragma once
 
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/dynamic_bitset.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 #include <RDGeneral/export.h>
 

Code/GraphMol/CIPLabeler/Digraph.h

@@ -20,7 +20,9 @@
 #include <list>
 #include <vector>
 
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/rational.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 #include "TooManyNodesException.h"
 

Code/GraphMol/CIPLabeler/Mancude.h

@@ -21,7 +21,9 @@
 
 #include <vector>
 
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/rational.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 namespace RDKit {
 

Code/GraphMol/FileParsers/MolSGroupWriting.cpp

@@ -8,7 +8,9 @@
 //  of the RDKit source tree.
 //
 
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/algorithm/string/join.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 #include "FileParsers.h"
 #include "MolSGroupWriting.h"

Code/GraphMol/FileParsers/MolSGroupWriting.h

@@ -10,8 +10,10 @@
 
 #pragma once
 
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/format.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 #include <GraphMol/SubstanceGroup.h>
 
 namespace RDKit {

Code/GraphMol/FileParsers/SDWriter.cpp

@@ -13,7 +13,9 @@
 #include <sstream>
 #include <string>
 
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/any.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 #include <RDGeneral/BadFileException.h>
 #include <RDGeneral/FileParseException.h>

Code/GraphMol/FileParsers/TDTWriter.cpp

@@ -14,7 +14,9 @@
 #include <sstream>
 #include <string>
 
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/algorithm/string.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 #include <GraphMol/SmilesParse/SmilesWrite.h>
 #include <RDGeneral/BadFileException.h>

Code/GraphMol/FileParsers/XYZFileParser.cpp

@@ -8,7 +8,9 @@
 //  of the RDKit source tree.
 //
 
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/lexical_cast.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 #include "FileParsers.h"
 #include "FileParserUtils.h"

Code/GraphMol/MolDraw2D/AtomSymbol.cpp

@@ -10,8 +10,10 @@
 // Original author: David Cosgrove (CozChemIx Limited)
 //
 
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/format.hpp>
 #include <boost/algorithm/string.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 #include <GraphMol/MolDraw2D/AtomSymbol.h>
 #include <GraphMol/MolDraw2D/DrawText.h>

Code/GraphMol/MolDraw2D/DrawTextJS.cpp

@@ -12,7 +12,9 @@
 // to draw text onto a picture.
 #ifdef __EMSCRIPTEN__
 #include <sstream>
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/algorithm/string.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 #include <GraphMol/MolDraw2D/DrawTextJS.h>
 #include <GraphMol/MolDraw2D/MolDraw2DJS.h>

Code/GraphMol/MolDraw2D/DrawTextSVG.cpp

@@ -13,8 +13,10 @@
 // to draw text onto a picture.
 
 #include <sstream>
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 #include <GraphMol/MolDraw2D/MolDraw2DDetails.h>
 #include <GraphMol/MolDraw2D/DrawTextSVG.h>

Code/GraphMol/PartialCharges/GasteigerParams.cpp

@@ -8,15 +8,14 @@
 //  which is included in the file license.txt, found at the root
 //  of the RDKit source tree.
 //
-#include <boost/tokenizer.hpp>
-typedef boost::tokenizer<boost::char_separator<char>> tokenizer;
-#include "GasteigerParams.h"
-
 #include <RDGeneral/BoostStartInclude.h>
 #include <boost/flyweight.hpp>
 #include <boost/flyweight/key_value.hpp>
 #include <boost/flyweight/no_tracking.hpp>
+#include <boost/tokenizer.hpp>
+typedef boost::tokenizer<boost::char_separator<char>> tokenizer;
 #include <RDGeneral/BoostEndInclude.h>
+#include "GasteigerParams.h"
 
 #include <sstream>
 #include <locale>

Code/GraphMol/RWMol.cpp

@@ -8,7 +8,9 @@
 //  of the RDKit source tree.
 //
 
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/tokenizer.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 // our stuff
 #include <RDGeneral/Invariant.h>

Code/GraphMol/RascalMCES/PartitionSet.h

@@ -14,7 +14,9 @@
 #include <map>
 #include <vector>
 
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/dynamic_bitset.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 namespace RDKit {
 

Code/GraphMol/RascalMCES/RascalMCES.cpp

@@ -23,8 +23,10 @@
 #include <unordered_set>
 #include <vector>
 
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/dynamic_bitset.hpp>
 #include <boost/algorithm/string.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 #include <GraphMol/ROMol.h>
 #include <GraphMol/MolOps.h>

Code/GraphMol/RascalMCES/RascalResult.cpp

@@ -11,8 +11,10 @@
 #include <regex>
 #include <set>
 
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/dynamic_bitset.hpp>
 #include <boost/algorithm/string.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 #include <GraphMol/MolOps.h>
 #include <GraphMol/QueryAtom.h>

Code/GraphMol/StereoGroup.cpp

@@ -2,7 +2,9 @@
 #include <utility>
 #include <vector>
 
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/dynamic_bitset.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 #include "StereoGroup.h"
 #include "Atom.h"

Code/RDGeneral/RDExportMacros.h

@@ -16,7 +16,18 @@
 #pragma warning(disable : 4275)
 #endif
 
+#ifdef BOOST_NO_CXX98_FUNCTION_BASE
+#undef BOOST_NO_CXX98_FUNCTION_BASE
+#ifndef _SHOULD_DEFINE_BOOST_NO_CXX98_FUNCTION_BASE
+#define _SHOULD_DEFINE_BOOST_NO_CXX98_FUNCTION_BASE 1
+#endif
+#endif
 #include <boost/config.hpp>
+#ifdef _SHOULD_DEFINE_BOOST_NO_CXX98_FUNCTION_BASE
+#ifndef BOOST_NO_CXX98_FUNCTION_BASE
+#define BOOST_NO_CXX98_FUNCTION_BASE 1
+#endif
+#endif
 
 // RDKit export macro definitions
 #ifdef RDKIT_DYN_LINK

External/GA/util/Util.cpp

@@ -11,7 +11,9 @@
 #include <string>
 #include <cstdlib>
 
+#include <RDGeneral/BoostStartInclude.h>
 #include <boost/algorithm/string.hpp>
+#include <RDGeneral/BoostEndInclude.h>
 
 #include "Util.h"