Address some compilation failures with various compilers.

Tencent · Apr 11, 2019 · 41e5efe · 41e5efe
1 parent 32d006d
commit 41e5efe
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 10 deletions.
diff --git a/include/rapidjson/allocators.h b/include/rapidjson/allocators.h
@@ -18,12 +18,17 @@
 #include "rapidjson.h"
 
 #include <memory>
-#if RAPIDJSON_HAS_CXX11_TYPETRAITS
+#if RAPIDJSON_HAS_CXX11
 #include <type_traits>
 #endif
 
 RAPIDJSON_NAMESPACE_BEGIN
 
+RAPIDJSON_DIAG_PUSH
+#ifdef __GNUC__
+RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 // Allocator
 
@@ -89,7 +94,7 @@ class StdBaseAllocator {
     };
 
     StdBaseAllocator(Allocator &allocator) RAPIDJSON_NOEXCEPT :
-        allocator_(allocator) {
+        allocator_(&allocator) {
     }
 
     StdBaseAllocator(const StdBaseAllocator& other) RAPIDJSON_NOEXCEPT :
@@ -101,6 +106,14 @@ class StdBaseAllocator {
         allocator_(other.allocator_) {
     }
 
+#if RAPIDJSON_HAS_CXX11
+    StdBaseAllocator(StdBaseAllocator&& other) RAPIDJSON_NOEXCEPT :
+        allocator_(other.allocator_) {
+    }
+    using propagate_on_container_move_assignment = std::true_type;
+    using is_always_equal = std::is_empty<Allocator>;
+#endif
+
     size_type max_size() const RAPIDJSON_NOEXCEPT {
         return static_cast<size_type>(-1) / sizeof(value_type);
     }
@@ -128,7 +141,7 @@ class StdBaseAllocator {
     void construct(pointer p, const_reference r) {
         ::new(static_cast<void*>(p)) value_type(r);
     }
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+#if RAPIDJSON_HAS_CXX11
     template<typename OtherType, typename... Args>
     void construct(OtherType* p, Args&&... args) {
         ::new(static_cast<void*>(p)) OtherType(std::forward<Args>(args)...);
@@ -156,10 +169,11 @@ class StdBaseAllocator {
     }
     pointer Reallocate(pointer old, size_type old_n, size_type new_n) {
         RAPIDJSON_ASSERT(sizeof(value_type) == 1 || new_n <= max_size());
-        return static_cast<pointer>(allocator_.Realloc(old, old_n * sizeof(value_type),
-                                                            new_n * sizeof(value_type)));
+        return static_cast<pointer>(allocator_->Realloc(old, old_n * sizeof(value_type),
+                                                             new_n * sizeof(value_type)));
     }
-#if 0 && RAPIDJSON_HAS_CXX11_RVALUE_REFS
+
+#if RAPIDJSON_HAS_CXX11
     template<typename OtherType, typename... Args>
     OtherType *New(Args&&... args) {
         typename rebind<OtherType>::other a(*this);
@@ -176,11 +190,29 @@ class StdBaseAllocator {
 #endif
 
 private:
+    Allocator *allocator_;
+
     StdBaseAllocator() /* = delete */;
-    template <typename, typename> friend class StdBaseAllocator; // OtherType::allocator_
-    Allocator &allocator_;
+
+    // For OtherType::allocator_
+    template <typename, typename>
+    friend class StdBaseAllocator;
+    template<typename T1, typename T2, typename A>
+    friend bool operator==(const StdBaseAllocator<T1, A>& a1,
+                           const StdBaseAllocator<T2, A>& a2) RAPIDJSON_NOEXCEPT;
 };
 
+template<typename T1, typename T2, typename A>
+bool operator==(const StdBaseAllocator<T1, A>& a1,
+                const StdBaseAllocator<T2, A>& a2) RAPIDJSON_NOEXCEPT {
+    return a1.allocator_ == a2.allocator_;
+}
+template<typename T1, typename T2, typename A>
+bool operator!=(const StdBaseAllocator<T1, A>& a1,
+                const StdBaseAllocator<T2, A>& a2) RAPIDJSON_NOEXCEPT {
+    return !(a1 == a2);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // CrtAllocator
 
@@ -406,6 +438,8 @@ class MemoryPoolAllocator : public StdBaseAllocator<unsigned char, MemoryPoolAll
     BaseAllocator* ownBaseAllocator_;   //!< base allocator created by this object.
 };
 
+RAPIDJSON_DIAG_POP
+
 RAPIDJSON_NAMESPACE_END
 
 #endif // RAPIDJSON_ENCODINGS_H_
diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h
@@ -412,7 +412,6 @@ inline GenericStringRef<CharType> StringRef(const std::basic_string<CharType>& s
 #ifdef RAPIDJSON_USE_MEMBERS_MAP
 template <typename Encoding, typename Allocator>
 struct GenericMemberMap {
-    typedef Allocator AllocatorType;
     typedef typename Encoding::Ch Ch;
     typedef GenericStringRef<Ch> KeyType;
     struct KeyLess {
@@ -421,9 +420,10 @@ struct GenericMemberMap {
             return cmp < 0 || (cmp == 0 && s1.length < s2.length);
         }
     };
+    typedef std::pair<const KeyType, SizeType> Pair;
+    typedef typename Allocator::template rebind<Pair>::other AllocatorType;
     typedef std::multimap<KeyType, SizeType, KeyLess, AllocatorType> Map;
     typedef typename Map::iterator Iterator;
-    typedef typename Map::value_type Pair;
 };
 #endif
 

diff --git a/include/rapidjson/rapidjson.h b/include/rapidjson/rapidjson.h
@@ -535,6 +535,10 @@ RAPIDJSON_NAMESPACE_END
 ///////////////////////////////////////////////////////////////////////////////
 // C++11 features
 
+#ifndef RAPIDJSON_HAS_CXX11
+#define RAPIDJSON_HAS_CXX11 (__cplusplus >= 201103L)
+#endif
+
 #ifndef RAPIDJSON_HAS_CXX11_RVALUE_REFS
 #if defined(__clang__)
 #if __has_feature(cxx_rvalue_references) && \