From b22ffc63da48d37bc88b39e43d1e4c5994c024ed Mon Sep 17 00:00:00 2001
From: Robert Ramey <ramey@rrsd.com>
Date: Mon, 16 Dec 2019 06:43:53 -0800
Subject: [PATCH] Fixed some MACRO constants to be consistent with Boost
 Guidelines.

---
 include/boost/archive/basic_archive.hpp         | 2 +-
 include/boost/archive/detail/basic_oarchive.hpp | 2 +-
 include/boost/archive/detail/iserializer.hpp    | 8 ++++----
 src/basic_iarchive.cpp                          | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/boost/archive/basic_archive.hpp b/include/boost/archive/basic_archive.hpp
index b0fd69a6..2f1c05dd 100644
--- a/include/boost/archive/basic_archive.hpp
+++ b/include/boost/archive/basic_archive.hpp
@@ -142,7 +142,7 @@ public:
     }
 };
 
-#define NULL_POINTER_TAG boost::archive::class_id_type(-1)
+#define BOOST_SERIALIZATION_NULL_POINTER_TAG boost::archive::class_id_type(-1)
 
 class object_id_type {
 private:
diff --git a/include/boost/archive/detail/basic_oarchive.hpp b/include/boost/archive/detail/basic_oarchive.hpp
index 61e9fbdc..0e8361b0 100644
--- a/include/boost/archive/detail/basic_oarchive.hpp
+++ b/include/boost/archive/detail/basic_oarchive.hpp
@@ -77,7 +77,7 @@ public:
         const basic_pointer_oserializer * bpos_ptr
     );
     void save_null_pointer(){
-        vsave(NULL_POINTER_TAG);
+        vsave(BOOST_SERIALIZATION_NULL_POINTER_TAG);
     }
     // real public interface starts here
     BOOST_ARCHIVE_DECL void end_preamble(); // default implementation does nothing
diff --git a/include/boost/archive/detail/iserializer.hpp b/include/boost/archive/detail/iserializer.hpp
index 33d8d90e..12ab404a 100644
--- a/include/boost/archive/detail/iserializer.hpp
+++ b/include/boost/archive/detail/iserializer.hpp
@@ -60,12 +60,12 @@ namespace std{
 #if !defined(BOOST_MSVC) && \
     (BOOST_WORKAROUND(__IBMCPP__, < 1210) || \
     defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x590))
-    #define DONT_USE_HAS_NEW_OPERATOR 1
+    #define BOOST_SERIALIZATION_DONT_USE_HAS_NEW_OPERATOR 1
 #else
-    #define DONT_USE_HAS_NEW_OPERATOR 0
+    #define BOOST_SERIALIZATION_DONT_USE_HAS_NEW_OPERATOR 0
 #endif
 
-#if ! DONT_USE_HAS_NEW_OPERATOR
+#if ! BOOST_SERIALIZATION_DONT_USE_HAS_NEW_OPERATOR
 #include <boost/type_traits/has_new_operator.hpp>
 #endif
 
@@ -208,7 +208,7 @@ BOOST_DLLEXPORT void iserializer<Archive, T>::load_object_data(
 template<class T>
 struct heap_allocation {
     // boost::has_new_operator< T > doesn't work on these compilers
-    #if DONT_USE_HAS_NEW_OPERATOR
+    #if BOOST_SERIALIZATION_DONT_USE_HAS_NEW_OPERATOR
         // This doesn't handle operator new overload for class T
         static T * invoke_new(){
             return static_cast<T *>(operator new(sizeof(T)));
diff --git a/src/basic_iarchive.cpp b/src/basic_iarchive.cpp
index 344e37a3..86299714 100644
--- a/src/basic_iarchive.cpp
+++ b/src/basic_iarchive.cpp
@@ -427,7 +427,7 @@ basic_iarchive_impl::load_pointer(
     class_id_type cid;
     load(ar, cid);
 
-    if(NULL_POINTER_TAG == cid){
+    if(BOOST_SERIALIZATION_NULL_POINTER_TAG == cid){
         t = NULL;
         return bpis_ptr;
     }