Merge pull request #219 from LLNL/feature/bugfix_json

Bugfix: general_string_equal
LLNL · May 4, 2022 · f470995 · f470995
2 parents ad244e9 + 2d625cb
commit f470995
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/include/metall/container/experimental/json/json_fwd.hpp b/include/metall/container/experimental/json/json_fwd.hpp
@@ -63,8 +63,8 @@ inline bool general_indexed_object_equal(const indexed_object<allocator_type> &,
 template <typename allocator_type, typename other_array_type>
 inline bool general_array_equal(const array<allocator_type> &, const other_array_type &) noexcept;
 
-template <typename allocator_type, typename other_string_type>
-inline bool general_string_equal(const string<allocator_type> &, const other_string_type &) noexcept;
+template <typename char_t, typename traits, typename allocator, typename other_string_type>
+inline bool general_string_equal(const string<char_t, traits, allocator> &, const other_string_type &) noexcept;
 }
 #endif // DOXYGEN_SKIP
 

diff --git a/include/metall/container/experimental/json/string.hpp b/include/metall/container/experimental/json/string.hpp
@@ -11,8 +11,9 @@
 namespace metall::container::experimental::json {
 namespace jsndtl {
 
-template <typename allocator_type, typename other_string_type>
-inline bool general_string_equal(const string<allocator_type> &string, const other_string_type &other_string) noexcept {
+template <typename char_t, typename traits, typename allocator, typename other_string_type>
+inline bool general_string_equal(const string<char_t, traits, allocator> &string,
+                                 const other_string_type &other_string) noexcept {
   return std::strcmp(string.c_str(), other_string.c_str()) == 0;
 }