From 71c4103475bdd8c9e5962e4897d01877c357c79b Mon Sep 17 00:00:00 2001
From: Paolo Tosco <paolo.tosco.mail@gmail.com>
Date: Sat, 29 Mar 2025 20:04:58 +0100
Subject: [PATCH] Suppress large amounts of 'BOOST_NO_CXX98_FUNCTION_BASE macro
 redefined' warnings in clang/emcc builds (#7747)

---
 Code/GraphMol/CIPLabeler/CIPLabeler.h            |  2 ++
 Code/GraphMol/CIPLabeler/Digraph.h               |  2 ++
 Code/GraphMol/CIPLabeler/Mancude.h               |  2 ++
 Code/GraphMol/FileParsers/MolSGroupWriting.cpp   |  2 ++
 Code/GraphMol/FileParsers/MolSGroupWriting.h     |  2 ++
 Code/GraphMol/FileParsers/SDWriter.cpp           |  2 ++
 Code/GraphMol/FileParsers/TDTWriter.cpp          |  2 ++
 Code/GraphMol/FileParsers/XYZFileParser.cpp      |  2 ++
 Code/GraphMol/MolDraw2D/AtomSymbol.cpp           |  2 ++
 Code/GraphMol/MolDraw2D/DrawTextJS.cpp           |  2 ++
 Code/GraphMol/MolDraw2D/DrawTextSVG.cpp          |  2 ++
 Code/GraphMol/PartialCharges/GasteigerParams.cpp |  7 +++----
 Code/GraphMol/RWMol.cpp                          |  2 ++
 Code/GraphMol/RascalMCES/PartitionSet.h          |  2 ++
 Code/GraphMol/RascalMCES/RascalMCES.cpp          |  2 ++
 Code/GraphMol/RascalMCES/RascalResult.cpp        |  2 ++
 Code/GraphMol/StereoGroup.cpp                    |  2 ++
 Code/RDGeneral/RDExportMacros.h                  | 11 +++++++++++
 External/GA/util/Util.cpp                        |  2 ++
 19 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/Code/GraphMol/CIPLabeler/CIPLabeler.h b/Code/GraphMol/CIPLabeler/CIPLabeler.h
index 451721663..6a1342b94 100644
--- a/Code/GraphMol/CIPLabeler/CIPLabeler.h
+++ b/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>
 
diff --git a/Code/GraphMol/CIPLabeler/Digraph.h b/Code/GraphMol/CIPLabeler/Digraph.h
index 0309f52fa..97f9dfad6 100644
--- a/Code/GraphMol/CIPLabeler/Digraph.h
+++ b/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"
 
diff --git a/Code/GraphMol/CIPLabeler/Mancude.h b/Code/GraphMol/CIPLabeler/Mancude.h
index 33ecb0194..f3fc4422b 100644
--- a/Code/GraphMol/CIPLabeler/Mancude.h
+++ b/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 {
 
diff --git a/Code/GraphMol/FileParsers/MolSGroupWriting.cpp b/Code/GraphMol/FileParsers/MolSGroupWriting.cpp
index 9fb26fd8a..d472b5525 100644
--- a/Code/GraphMol/FileParsers/MolSGroupWriting.cpp
+++ b/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"
diff --git a/Code/GraphMol/FileParsers/MolSGroupWriting.h b/Code/GraphMol/FileParsers/MolSGroupWriting.h
index 602f97924..a5d1f9bb3 100644
--- a/Code/GraphMol/FileParsers/MolSGroupWriting.h
+++ b/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 {
diff --git a/Code/GraphMol/FileParsers/SDWriter.cpp b/Code/GraphMol/FileParsers/SDWriter.cpp
index 375e7b545..90ac3a8fc 100644
--- a/Code/GraphMol/FileParsers/SDWriter.cpp
+++ b/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>
diff --git a/Code/GraphMol/FileParsers/TDTWriter.cpp b/Code/GraphMol/FileParsers/TDTWriter.cpp
index e7a253bab..032082a21 100644
--- a/Code/GraphMol/FileParsers/TDTWriter.cpp
+++ b/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>
diff --git a/Code/GraphMol/FileParsers/XYZFileParser.cpp b/Code/GraphMol/FileParsers/XYZFileParser.cpp
index 5cd6e2487..385856914 100644
--- a/Code/GraphMol/FileParsers/XYZFileParser.cpp
+++ b/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"
diff --git a/Code/GraphMol/MolDraw2D/AtomSymbol.cpp b/Code/GraphMol/MolDraw2D/AtomSymbol.cpp
index 281605f18..f7d2805c0 100644
--- a/Code/GraphMol/MolDraw2D/AtomSymbol.cpp
+++ b/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>
diff --git a/Code/GraphMol/MolDraw2D/DrawTextJS.cpp b/Code/GraphMol/MolDraw2D/DrawTextJS.cpp
index 6b4888c2d..b2b7c3ea4 100644
--- a/Code/GraphMol/MolDraw2D/DrawTextJS.cpp
+++ b/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>
diff --git a/Code/GraphMol/MolDraw2D/DrawTextSVG.cpp b/Code/GraphMol/MolDraw2D/DrawTextSVG.cpp
index 3b99c3013..2f6f19045 100644
--- a/Code/GraphMol/MolDraw2D/DrawTextSVG.cpp
+++ b/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>
diff --git a/Code/GraphMol/PartialCharges/GasteigerParams.cpp b/Code/GraphMol/PartialCharges/GasteigerParams.cpp
index 9e7be8785..500eeaee3 100644
--- a/Code/GraphMol/PartialCharges/GasteigerParams.cpp
+++ b/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>
diff --git a/Code/GraphMol/RWMol.cpp b/Code/GraphMol/RWMol.cpp
index 81064b8d3..6816b0c23 100644
--- a/Code/GraphMol/RWMol.cpp
+++ b/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>
diff --git a/Code/GraphMol/RascalMCES/PartitionSet.h b/Code/GraphMol/RascalMCES/PartitionSet.h
index c683b8370..2bc387c7b 100644
--- a/Code/GraphMol/RascalMCES/PartitionSet.h
+++ b/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 {
 
diff --git a/Code/GraphMol/RascalMCES/RascalMCES.cpp b/Code/GraphMol/RascalMCES/RascalMCES.cpp
index a72ca9f25..cefd2b489 100644
--- a/Code/GraphMol/RascalMCES/RascalMCES.cpp
+++ b/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>
diff --git a/Code/GraphMol/RascalMCES/RascalResult.cpp b/Code/GraphMol/RascalMCES/RascalResult.cpp
index f5c7b5005..de3cd9822 100644
--- a/Code/GraphMol/RascalMCES/RascalResult.cpp
+++ b/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>
diff --git a/Code/GraphMol/StereoGroup.cpp b/Code/GraphMol/StereoGroup.cpp
index b2f0ffaae..0b5324bef 100644
--- a/Code/GraphMol/StereoGroup.cpp
+++ b/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"
diff --git a/Code/RDGeneral/RDExportMacros.h b/Code/RDGeneral/RDExportMacros.h
index 66a88bd89..d2f537b93 100644
--- a/Code/RDGeneral/RDExportMacros.h
+++ b/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
diff --git a/External/GA/util/Util.cpp b/External/GA/util/Util.cpp
index 16558fb2a..e48dc5f8a 100644
--- a/External/GA/util/Util.cpp
+++ b/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"