Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
9d726c25
Unverified
Commit
9d726c25
authored
Aug 12, 2020
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
♻
remove "#define private public"
parent
b888afe5
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
59 additions
and
36 deletions
+59
-36
Makefile
Makefile
+0
-2
include/nlohmann/detail/iterators/iter_impl.hpp
include/nlohmann/detail/iterators/iter_impl.hpp
+2
-2
include/nlohmann/detail/iterators/primitive_iterator.hpp
include/nlohmann/detail/iterators/primitive_iterator.hpp
+1
-0
include/nlohmann/detail/json_pointer.hpp
include/nlohmann/detail/json_pointer.hpp
+4
-0
include/nlohmann/detail/macro_scope.hpp
include/nlohmann/detail/macro_scope.hpp
+7
-0
include/nlohmann/detail/macro_unscope.hpp
include/nlohmann/detail/macro_unscope.hpp
+1
-0
include/nlohmann/detail/output/serializer.hpp
include/nlohmann/detail/output/serializer.hpp
+2
-1
include/nlohmann/json.hpp
include/nlohmann/json.hpp
+6
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+23
-4
test/src/unit-allocator.cpp
test/src/unit-allocator.cpp
+1
-2
test/src/unit-class_const_iterator.cpp
test/src/unit-class_const_iterator.cpp
+1
-2
test/src/unit-class_iterator.cpp
test/src/unit-class_iterator.cpp
+1
-2
test/src/unit-class_lexer.cpp
test/src/unit-class_lexer.cpp
+1
-2
test/src/unit-class_parser.cpp
test/src/unit-class_parser.cpp
+1
-2
test/src/unit-constructor1.cpp
test/src/unit-constructor1.cpp
+1
-2
test/src/unit-convenience.cpp
test/src/unit-convenience.cpp
+1
-2
test/src/unit-conversions.cpp
test/src/unit-conversions.cpp
+1
-2
test/src/unit-iterators1.cpp
test/src/unit-iterators1.cpp
+1
-2
test/src/unit-json_pointer.cpp
test/src/unit-json_pointer.cpp
+1
-2
test/src/unit-regression1.cpp
test/src/unit-regression1.cpp
+1
-2
test/src/unit-regression2.cpp
test/src/unit-regression2.cpp
+1
-2
test/src/unit-unicode.cpp
test/src/unit-unicode.cpp
+1
-2
No files found.
Makefile
View file @
9d726c25
...
...
@@ -81,7 +81,6 @@ doctest:
# -Wno-documentation-unknown-command: code uses user-defined commands like @complexity
# -Wno-exit-time-destructors: warning in json code triggered by NLOHMANN_JSON_SERIALIZE_ENUM
# -Wno-float-equal: not all comparisons in the tests can be replaced by Approx
# -Wno-keyword-macro: unit-tests use "#define private public"
# -Wno-missing-prototypes: for NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
# -Wno-padded: padding is nothing to warn about
# -Wno-range-loop-analysis: items tests "for(const auto i...)"
...
...
@@ -98,7 +97,6 @@ pedantic_clang:
-Wno-documentation-unknown-command
\
-Wno-exit-time-destructors
\
-Wno-float-equal
\
-Wno-keyword-macro
\
-Wno-missing-prototypes
\
-Wno-padded
\
-Wno-range-loop-analysis
\
...
...
include/nlohmann/detail/iterators/iter_impl.hpp
View file @
9d726c25
...
...
@@ -163,7 +163,7 @@ class iter_impl
return
*
this
;
}
private
:
JSON_PRIVATE_UNLESS_TESTED
:
/*!
@brief set the iterator to the first value
@pre The iterator is initialized; i.e. `m_object != nullptr`.
...
...
@@ -627,7 +627,7 @@ class iter_impl
return
operator
*
();
}
private
:
JSON_PRIVATE_UNLESS_TESTED
:
/// associated JSON instance
pointer
m_object
=
nullptr
;
/// the actual iterator of the associated instance
...
...
include/nlohmann/detail/iterators/primitive_iterator.hpp
View file @
9d726c25
...
...
@@ -23,6 +23,7 @@ class primitive_iterator_t
static
constexpr
difference_type
begin_value
=
0
;
static
constexpr
difference_type
end_value
=
begin_value
+
1
;
JSON_PRIVATE_UNLESS_TESTED:
/// iterator as signed integer type
difference_type
m_it
=
(
std
::
numeric_limits
<
std
::
ptrdiff_t
>::
min
)();
...
...
include/nlohmann/detail/json_pointer.hpp
View file @
9d726c25
...
...
@@ -375,6 +375,7 @@ class json_pointer
return
static_cast
<
size_type
>
(
res
);
}
JSON_PRIVATE_UNLESS_TESTED:
json_pointer
top
()
const
{
if
(
JSON_HEDLEY_UNLIKELY
(
empty
()))
...
...
@@ -387,6 +388,7 @@ class json_pointer
return
result
;
}
private:
/*!
@brief create and return a reference to the pointed to value
...
...
@@ -823,6 +825,7 @@ class json_pointer
{}
}
JSON_PRIVATE_UNLESS_TESTED:
/// escape "~" to "~0" and "/" to "~1"
static
std
::
string
escape
(
std
::
string
s
)
{
...
...
@@ -838,6 +841,7 @@ class json_pointer
replace_substring
(
s
,
"~0"
,
"~"
);
}
private:
/*!
@param[in] reference_string the reference string to the current value
@param[in] value the value to consider
...
...
include/nlohmann/detail/macro_scope.hpp
View file @
9d726c25
...
...
@@ -83,6 +83,13 @@
#define JSON_ASSERT(x) assert(x)
#endif
// allow to access some private functions (needed by the test suite)
#if defined(JSON_TESTS_PRIVATE)
#define JSON_PRIVATE_UNLESS_TESTED public
#else
#define JSON_PRIVATE_UNLESS_TESTED private
#endif
/*!
@brief macro to briefly define a mapping between an enum and JSON
@def NLOHMANN_JSON_SERIALIZE_ENUM
...
...
include/nlohmann/detail/macro_unscope.hpp
View file @
9d726c25
...
...
@@ -14,6 +14,7 @@
#undef JSON_CATCH
#undef JSON_THROW
#undef JSON_TRY
#undef JSON_PRIVATE_UNLESS_TESTED
#undef JSON_HAS_CPP_14
#undef JSON_HAS_CPP_17
#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
...
...
include/nlohmann/detail/output/serializer.hpp
View file @
9d726c25
...
...
@@ -362,7 +362,7 @@ class serializer
}
}
private
:
JSON_PRIVATE_UNLESS_TESTED
:
/*!
@brief dump escaped string
...
...
@@ -625,6 +625,7 @@ class serializer
}
}
private:
/*!
@brief count digits
...
...
include/nlohmann/json.hpp
View file @
9d726c25
...
...
@@ -189,6 +189,7 @@ class basic_json
/// workaround type for MSVC
using
basic_json_t
=
NLOHMANN_BASIC_JSON_TPL
;
JSON_PRIVATE_UNLESS_TESTED:
// convenience aliases for types residing in namespace detail;
using
lexer
=
::
nlohmann
::
detail
::
lexer_base
<
basic_json
>
;
...
...
@@ -204,6 +205,7 @@ class basic_json
std
::
move
(
cb
),
allow_exceptions
,
ignore_comments
);
}
private:
using
primitive_iterator_t
=
::
nlohmann
::
detail
::
primitive_iterator_t
;
template
<
typename
BasicJsonType
>
using
internal_iterator
=
::
nlohmann
::
detail
::
internal_iterator
<
BasicJsonType
>
;
...
...
@@ -220,6 +222,7 @@ class basic_json
using
binary_reader
=
::
nlohmann
::
detail
::
binary_reader
<
basic_json
,
InputType
>
;
template
<
typename
CharType
>
using
binary_writer
=
::
nlohmann
::
detail
::
binary_writer
<
basic_json
,
CharType
>
;
JSON_PRIVATE_UNLESS_TESTED:
using
serializer
=
::
nlohmann
::
detail
::
serializer
<
basic_json
>
;
public:
...
...
@@ -934,6 +937,7 @@ class basic_json
// JSON value storage //
////////////////////////
JSON_PRIVATE_UNLESS_TESTED:
/*!
@brief a JSON value
...
...
@@ -1210,6 +1214,7 @@ class basic_json
}
};
private:
/*!
@brief checks the class invariants
...
...
@@ -6947,7 +6952,7 @@ class basic_json
}
private
:
JSON_PRIVATE_UNLESS_TESTED
:
//////////////////////
// member variables //
//////////////////////
...
...
single_include/nlohmann/json.hpp
View file @
9d726c25
...
...
@@ -2100,6 +2100,13 @@ JSON_HEDLEY_DIAGNOSTIC_POP
#define JSON_ASSERT(x) assert(x)
#endif
// allow to access some private functions (needed by the test suite)
#if defined(JSON_TESTS_PRIVATE)
#define JSON_PRIVATE_UNLESS_TESTED public
#else
#define JSON_PRIVATE_UNLESS_TESTED private
#endif
/*!
@brief macro to briefly define a mapping between an enum and JSON
@def NLOHMANN_JSON_SERIALIZE_ENUM
...
...
@@ -10642,6 +10649,7 @@ class primitive_iterator_t
static
constexpr
difference_type
begin_value
=
0
;
static
constexpr
difference_type
end_value
=
begin_value
+
1
;
JSON_PRIVATE_UNLESS_TESTED:
/// iterator as signed integer type
difference_type
m_it
=
(
std
::
numeric_limits
<
std
::
ptrdiff_t
>::
min
)();
...
...
@@ -10934,7 +10942,7 @@ class iter_impl
return
*
this
;
}
private
:
JSON_PRIVATE_UNLESS_TESTED
:
/*!
@brief set the iterator to the first value
@pre The iterator is initialized; i.e. `m_object != nullptr`.
...
...
@@ -11398,7 +11406,7 @@ class iter_impl
return
operator
*
();
}
private
:
JSON_PRIVATE_UNLESS_TESTED
:
/// associated JSON instance
pointer
m_object
=
nullptr
;
/// the actual iterator of the associated instance
...
...
@@ -11913,6 +11921,7 @@ class json_pointer
return
static_cast
<
size_type
>
(
res
);
}
JSON_PRIVATE_UNLESS_TESTED:
json_pointer
top
()
const
{
if
(
JSON_HEDLEY_UNLIKELY
(
empty
()))
...
...
@@ -11925,6 +11934,7 @@ class json_pointer
return
result
;
}
private:
/*!
@brief create and return a reference to the pointed to value
...
...
@@ -12361,6 +12371,7 @@ class json_pointer
{}
}
JSON_PRIVATE_UNLESS_TESTED:
/// escape "~" to "~0" and "/" to "~1"
static
std
::
string
escape
(
std
::
string
s
)
{
...
...
@@ -12376,6 +12387,7 @@ class json_pointer
replace_substring
(
s
,
"~0"
,
"~"
);
}
private:
/*!
@param[in] reference_string the reference string to the current value
@param[in] value the value to consider
...
...
@@ -15801,7 +15813,7 @@ class serializer
}
}
private
:
JSON_PRIVATE_UNLESS_TESTED
:
/*!
@brief dump escaped string
...
...
@@ -16064,6 +16076,7 @@ class serializer
}
}
private:
/*!
@brief count digits
...
...
@@ -16682,6 +16695,7 @@ class basic_json
/// workaround type for MSVC
using
basic_json_t
=
NLOHMANN_BASIC_JSON_TPL
;
JSON_PRIVATE_UNLESS_TESTED:
// convenience aliases for types residing in namespace detail;
using
lexer
=
::
nlohmann
::
detail
::
lexer_base
<
basic_json
>
;
...
...
@@ -16697,6 +16711,7 @@ class basic_json
std
::
move
(
cb
),
allow_exceptions
,
ignore_comments
);
}
private:
using
primitive_iterator_t
=
::
nlohmann
::
detail
::
primitive_iterator_t
;
template
<
typename
BasicJsonType
>
using
internal_iterator
=
::
nlohmann
::
detail
::
internal_iterator
<
BasicJsonType
>
;
...
...
@@ -16713,6 +16728,7 @@ class basic_json
using
binary_reader
=
::
nlohmann
::
detail
::
binary_reader
<
basic_json
,
InputType
>
;
template
<
typename
CharType
>
using
binary_writer
=
::
nlohmann
::
detail
::
binary_writer
<
basic_json
,
CharType
>
;
JSON_PRIVATE_UNLESS_TESTED:
using
serializer
=
::
nlohmann
::
detail
::
serializer
<
basic_json
>
;
public:
...
...
@@ -17427,6 +17443,7 @@ class basic_json
// JSON value storage //
////////////////////////
JSON_PRIVATE_UNLESS_TESTED:
/*!
@brief a JSON value
...
...
@@ -17703,6 +17720,7 @@ class basic_json
}
};
private:
/*!
@brief checks the class invariants
...
...
@@ -23440,7 +23458,7 @@ class basic_json
}
private
:
JSON_PRIVATE_UNLESS_TESTED
:
//////////////////////
// member variables //
//////////////////////
...
...
@@ -25296,6 +25314,7 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
#undef JSON_CATCH
#undef JSON_THROW
#undef JSON_TRY
#undef JSON_PRIVATE_UNLESS_TESTED
#undef JSON_HAS_CPP_14
#undef JSON_HAS_CPP_17
#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
...
...
test/src/unit-allocator.cpp
View file @
9d726c25
...
...
@@ -29,10 +29,9 @@ SOFTWARE.
#include "doctest_compatibility.h"
#define
private public
#define
JSON_TESTS_PRIVATE
#include <nlohmann/json.hpp>
using
nlohmann
::
json
;
#undef private
namespace
{
...
...
test/src/unit-class_const_iterator.cpp
View file @
9d726c25
...
...
@@ -29,10 +29,9 @@ SOFTWARE.
#include "doctest_compatibility.h"
#define
private public
#define
JSON_TESTS_PRIVATE
#include <nlohmann/json.hpp>
using
nlohmann
::
json
;
#undef private
TEST_CASE
(
"const_iterator class"
)
{
...
...
test/src/unit-class_iterator.cpp
View file @
9d726c25
...
...
@@ -29,10 +29,9 @@ SOFTWARE.
#include "doctest_compatibility.h"
#define
private public
#define
JSON_TESTS_PRIVATE
#include <nlohmann/json.hpp>
using
nlohmann
::
json
;
#undef private
TEST_CASE
(
"iterator class"
)
{
...
...
test/src/unit-class_lexer.cpp
View file @
9d726c25
...
...
@@ -29,10 +29,9 @@ SOFTWARE.
#include "doctest_compatibility.h"
#define
private public
#define
JSON_TESTS_PRIVATE
#include <nlohmann/json.hpp>
using
nlohmann
::
json
;
#undef private
namespace
{
...
...
test/src/unit-class_parser.cpp
View file @
9d726c25
...
...
@@ -29,10 +29,9 @@ SOFTWARE.
#include "doctest_compatibility.h"
#define
private public
#define
JSON_TESTS_PRIVATE
#include <nlohmann/json.hpp>
using
nlohmann
::
json
;
#undef private
#include <valarray>
...
...
test/src/unit-constructor1.cpp
View file @
9d726c25
...
...
@@ -30,10 +30,9 @@ SOFTWARE.
#include "doctest_compatibility.h"
DOCTEST_GCC_SUPPRESS_WARNING
(
"-Wfloat-equal"
)
#define
private public
#define
JSON_TESTS_PRIVATE
#include <nlohmann/json.hpp>
using
nlohmann
::
json
;
#undef private
#include <deque>
#include <forward_list>
...
...
test/src/unit-convenience.cpp
View file @
9d726c25
...
...
@@ -29,10 +29,9 @@ SOFTWARE.
#include "doctest_compatibility.h"
#define
private public
#define
JSON_TESTS_PRIVATE
#include <nlohmann/json.hpp>
using
nlohmann
::
json
;
#undef private
#include <sstream>
...
...
test/src/unit-conversions.cpp
View file @
9d726c25
...
...
@@ -29,10 +29,9 @@ SOFTWARE.
#include "doctest_compatibility.h"
#define
private public
#define
JSON_TESTS_PRIVATE
#include <nlohmann/json.hpp>
using
nlohmann
::
json
;
#undef private
#include <deque>
#include <forward_list>
...
...
test/src/unit-iterators1.cpp
View file @
9d726c25
...
...
@@ -29,10 +29,9 @@ SOFTWARE.
#include "doctest_compatibility.h"
#define
private public
#define
JSON_TESTS_PRIVATE
#include <nlohmann/json.hpp>
using
nlohmann
::
json
;
#undef private
TEST_CASE
(
"iterators 1"
)
{
...
...
test/src/unit-json_pointer.cpp
View file @
9d726c25
...
...
@@ -29,10 +29,9 @@ SOFTWARE.
#include "doctest_compatibility.h"
#define
private public
#define
JSON_TESTS_PRIVATE
#include <nlohmann/json.hpp>
using
nlohmann
::
json
;
#undef private
TEST_CASE
(
"JSON pointers"
)
{
...
...
test/src/unit-regression1.cpp
View file @
9d726c25
...
...
@@ -33,10 +33,9 @@ DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
// for some reason including this after the json header leads to linker errors with VS 2017...
#include <locale>
#define
private public
#define
JSON_TESTS_PRIVATE
#include <nlohmann/json.hpp>
using
nlohmann
::
json
;
#undef private
#include <fstream>
#include <sstream>
...
...
test/src/unit-regression2.cpp
View file @
9d726c25
...
...
@@ -33,10 +33,9 @@ DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
// for some reason including this after the json header leads to linker errors with VS 2017...
#include <locale>
#define
private public
#define
JSON_TESTS_PRIVATE
#include <nlohmann/json.hpp>
using
nlohmann
::
json
;
#undef private
#include <fstream>
#include <sstream>
...
...
test/src/unit-unicode.cpp
View file @
9d726c25
...
...
@@ -32,10 +32,9 @@ SOFTWARE.
// for some reason including this after the json header leads to linker errors with VS 2017...
#include <locale>
#define
private public
#define
JSON_TESTS_PRIVATE
#include <nlohmann/json.hpp>
using
nlohmann
::
json
;
#undef private
#include <fstream>
#include <sstream>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment