Skip to content

Add transparent comparator and perfect forwarding support to find() and count() #795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nlohmann merged 9 commits into from
Oct 27, 2017
Merged

Add transparent comparator and perfect forwarding support to find() and count() #795

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1a66679
Add string_view support
jseward Oct 21, 2017
59cde1a
Fix for _HAS_CXX17 == 0
jseward Oct 21, 2017
d468f8c
Use consistent logic to determine if string_view exists
jseward Oct 21, 2017
33c6511
Remove JSON_HAS_STRING_VIEW
jseward Oct 23, 2017
73b1629
Remove tabs for spaces
jseward Oct 24, 2017
16ffdbc
Remove c++17 support flag in cmake
jseward Oct 24, 2017
6c9a401
Remove old non-perfect forwarding find and count
jseward Oct 24, 2017
715c98b
Remove extra spaces
jseward Oct 24, 2017
992c836
Add missing spaces
jseward Oct 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/json.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@ SOFTWARE.
#endif

// string_view support
#if defined(_MSC_VER) && defined(_HAS_CXX17) && _HAS_CXX17 == 1
#define JSON_USE_STRING_VIEW
#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_MSC_VER) && _MSC_VER > 1900 && defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
Copy link
Copy Markdown
Contributor

@theodelrieu theodelrieu Oct 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we use __has_include instead?

#define JSON_HAS_STRING_VIEW
#endif

#if defined(JSON_USE_STRING_VIEW)
#if defined(JSON_HAS_STRING_VIEW)
#include <string_view>
#endif

Expand Down Expand Up @@ -7600,7 +7600,7 @@ class basic_json
specified "unordered" nature of JSON objects.
*/

#if defined(JSON_USE_STRING_VIEW)
#if defined(JSON_HAS_STRING_VIEW)
// if std::string_view is to be used the object_t must
// be declared with a transparent comparator
// https://stackoverflow.com/questions/35525777/use-of-string-view-for-map-lookup
Expand Down Expand Up @@ -9868,7 +9868,7 @@ class basic_json
#ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015
and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
#endif
#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_MSC_VER) && _MSC_VER >1900 && defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
#if defined(JSON_HAS_STRING_VIEW)
and not std::is_same<ValueType, typename std::string_view>::value
#endif
, int >::type = 0 >
Expand Down