Improve private macro names

Author: danielaparker

include/jsoncons/config/compiler_support.hpp

@@ -25,8 +25,8 @@
 
 // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54577
 #if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 9
-#define JSONCONS_NO_ERASE_TAKING_CONST_ITERATOR 1
-#define JSONCONS_NO_MAP_TAKING_ALLOCATOR 1
+#define JSONCONS_NO_VECTOR_ERASE_TAKES_CONST_ITERATOR 1
+#define JSONCONS_NO_MAP_CONS_TAKES_ALLOCATOR 1
 #endif
 
 #if defined(__clang__)

include/jsoncons/json_array.hpp

@@ -166,7 +166,7 @@ namespace jsoncons {
 
         iterator erase(const_iterator pos) 
         {
-    #if defined(JSONCONS_NO_ERASE_TAKING_CONST_ITERATOR)
+    #if defined(JSONCONS_NO_VECTOR_ERASE_TAKES_CONST_ITERATOR)
             iterator it = elements_.begin() + (pos - elements_.begin());
             return elements_.erase(it);
     #else
@@ -176,7 +176,7 @@ namespace jsoncons {
 
         iterator erase(const_iterator first, const_iterator last) 
         {
-    #if defined(JSONCONS_NO_ERASE_TAKING_CONST_ITERATOR)
+    #if defined(JSONCONS_NO_VECTOR_ERASE_TAKES_CONST_ITERATOR)
             iterator it1 = elements_.begin() + (first - elements_.begin());
             iterator it2 = elements_.begin() + (last - elements_.begin());
             return elements_.erase(it1,it2);
@@ -209,7 +209,7 @@ namespace jsoncons {
         typename std::enable_if<type_traits::is_stateless<A>::value,iterator>::type 
         insert(const_iterator pos, T&& value)
         {
-    #if defined(JSONCONS_NO_ERASE_TAKING_CONST_ITERATOR)
+    #if defined(JSONCONS_NO_VECTOR_ERASE_TAKES_CONST_ITERATOR)
             iterator it = elements_.begin() + (pos - elements_.begin());
             return elements_.emplace(it, std::forward<T>(value));
     #else
@@ -220,7 +220,7 @@ namespace jsoncons {
         typename std::enable_if<!type_traits::is_stateless<A>::value,iterator>::type 
         insert(const_iterator pos, T&& value)
         {
-    #if defined(JSONCONS_NO_ERASE_TAKING_CONST_ITERATOR)
+    #if defined(JSONCONS_NO_VECTOR_ERASE_TAKES_CONST_ITERATOR)
             iterator it = elements_.begin() + (pos - elements_.begin());
             return elements_.emplace(it, std::forward<T>(value), get_allocator());
     #else
@@ -231,7 +231,7 @@ namespace jsoncons {
         template <class InputIt>
         iterator insert(const_iterator pos, InputIt first, InputIt last)
         {
-    #if defined(JSONCONS_NO_ERASE_TAKING_CONST_ITERATOR)
+    #if defined(JSONCONS_NO_VECTOR_ERASE_TAKES_CONST_ITERATOR)
             iterator it = elements_.begin() + (pos - elements_.begin());
             elements_.insert(it, first, last);
             return first == last ? it : it + 1;
@@ -244,7 +244,7 @@ namespace jsoncons {
         typename std::enable_if<type_traits::is_stateless<A>::value,iterator>::type 
         emplace(const_iterator pos, Args&&... args)
         {
-    #if defined(JSONCONS_NO_ERASE_TAKING_CONST_ITERATOR)
+    #if defined(JSONCONS_NO_VECTOR_ERASE_TAKES_CONST_ITERATOR)
             iterator it = elements_.begin() + (pos - elements_.begin());
             return elements_.emplace(it, std::forward<Args>(args)...);
     #else

include/jsoncons/json_object.hpp

@@ -457,7 +457,7 @@ namespace jsoncons {
 
         iterator erase(const_iterator pos) 
         {
-    #if defined(JSONCONS_NO_ERASE_TAKING_CONST_ITERATOR)
+    #if defined(JSONCONS_NO_VECTOR_ERASE_TAKES_CONST_ITERATOR)
             iterator it = members_.begin() + (pos - members_.begin());
             return members_.erase(it);
     #else
@@ -467,7 +467,7 @@ namespace jsoncons {
 
         iterator erase(const_iterator first, const_iterator last) 
         {
-    #if defined(JSONCONS_NO_ERASE_TAKING_CONST_ITERATOR)
+    #if defined(JSONCONS_NO_VECTOR_ERASE_TAKES_CONST_ITERATOR)
             iterator it1 = members_.begin() + (first - members_.begin());
             iterator it2 = members_.begin() + (last - members_.begin());
             return members_.erase(it1,it2);
@@ -1233,7 +1233,7 @@ namespace jsoncons {
                 std::size_t pos2 = pos1 + 1;
 
                 erase_index_entries(pos1, pos2);
-    #if defined(JSONCONS_NO_ERASE_TAKING_CONST_ITERATOR)
+    #if defined(JSONCONS_NO_VECTOR_ERASE_TAKES_CONST_ITERATOR)
                 iterator it = members_.begin() + (pos - members_.begin());
                 return members_.erase(it);
     #else
@@ -1255,7 +1255,7 @@ namespace jsoncons {
             {
                 erase_index_entries(pos1,pos2);
 
-    #if defined(JSONCONS_NO_ERASE_TAKING_CONST_ITERATOR)
+    #if defined(JSONCONS_NO_VECTOR_ERASE_TAKES_CONST_ITERATOR)
                 iterator it1 = members_.begin() + (first - members_.begin());
                 iterator it2 = members_.begin() + (last - members_.begin());
                 return members_.erase(it1,it2);
@@ -1278,7 +1278,7 @@ namespace jsoncons {
                 std::size_t pos2 = pos1 + 1;
 
                 erase_index_entries(pos1, pos2);
-    #if defined(JSONCONS_NO_ERASE_TAKING_CONST_ITERATOR)
+    #if defined(JSONCONS_NO_VECTOR_ERASE_TAKES_CONST_ITERATOR)
                 iterator it = members_.begin() + (pos - members_.begin());
                 members_.erase(it);
     #else

include/jsoncons_ext/cbor/cbor_encoder.hpp

@@ -111,7 +111,7 @@ class basic_cbor_encoder final : public basic_json_visitor<char>
          options_(options), 
          alloc_(alloc),
          stack_(alloc),
-#if !defined(JSONCONS_NO_MAP_TAKING_ALLOCATOR) 
+#if !defined(JSONCONS_NO_MAP_CONS_TAKES_ALLOCATOR) 
          stringref_map_(alloc),
          bytestringref_map_(alloc),
 #endif