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
5696660e
Unverified
Commit
5696660e
authored
Oct 31, 2017
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🔨
another try to fix #714
adding std::ios_base::binary when opening all_unicode.json.cbor
parent
c4d66267
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
35 deletions
+34
-35
src/json.hpp
src/json.hpp
+1
-1
test/src/unit-regression.cpp
test/src/unit-regression.cpp
+33
-34
No files found.
src/json.hpp
View file @
5696660e
...
@@ -6789,7 +6789,7 @@ class json_ref
...
@@ -6789,7 +6789,7 @@ class json_ref
{}
{}
template
<
class
...
Args
>
template
<
class
...
Args
>
json_ref
(
Args
&&
...
args
)
json_ref
(
Args
&&
...
args
)
:
owned_value
(
std
::
forward
<
Args
>
(
args
)...),
:
owned_value
(
std
::
forward
<
Args
>
(
args
)...),
value_ref
(
&
owned_value
),
value_ref
(
&
owned_value
),
is_rvalue
(
true
)
is_rvalue
(
true
)
...
...
test/src/unit-regression.cpp
View file @
5696660e
...
@@ -38,10 +38,10 @@ using nlohmann::json;
...
@@ -38,10 +38,10 @@ using nlohmann::json;
namespace
namespace
{
{
struct
nocopy
struct
nocopy
{
{
nocopy
()
=
default
;
nocopy
()
=
default
;
nocopy
(
const
nocopy
&
)
=
delete
;
nocopy
(
const
nocopy
&
)
=
delete
;
int
val
=
0
;
int
val
=
0
;
...
@@ -49,7 +49,7 @@ namespace
...
@@ -49,7 +49,7 @@ namespace
{
{
j
=
{{
"val"
,
n
.
val
}};
j
=
{{
"val"
,
n
.
val
}};
}
}
};
};
}
}
TEST_CASE
(
"regression tests"
)
TEST_CASE
(
"regression tests"
)
...
@@ -1270,7 +1270,6 @@ TEST_CASE("regression tests")
...
@@ -1270,7 +1270,6 @@ TEST_CASE("regression tests")
}
}
}
}
/*
SECTION
(
"issue #714 - throw std::ios_base::failure exception when failbit set to true"
)
SECTION
(
"issue #714 - throw std::ios_base::failure exception when failbit set to true"
)
{
{
{
{
...
@@ -1293,11 +1292,11 @@ TEST_CASE("regression tests")
...
@@ -1293,11 +1292,11 @@ TEST_CASE("regression tests")
|
std
::
ios_base
::
badbit
|
std
::
ios_base
::
badbit
);
// handle different exceptions as 'file not found', 'permission denied'
);
// handle different exceptions as 'file not found', 'permission denied'
is.open("test/data/json_nlohmann_tests/all_unicode.json.cbor");
is
.
open
(
"test/data/json_nlohmann_tests/all_unicode.json.cbor"
,
std
::
ios_base
::
in
|
std
::
ios_base
::
binary
);
CHECK_NOTHROW
(
nlohmann
::
json
::
from_cbor
(
is
));
CHECK_NOTHROW
(
nlohmann
::
json
::
from_cbor
(
is
));
}
}
}
}
*/
SECTION
(
"issue #805 - copy constructor is used with std::initializer_list constructor."
)
SECTION
(
"issue #805 - copy constructor is used with std::initializer_list constructor."
)
{
{
...
...
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