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
025f4cea
Unverified
Commit
025f4cea
authored
Jul 01, 2019
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🚨
fix warning
parent
89736219
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
3 deletions
+1
-3
Makefile
Makefile
+1
-1
include/nlohmann/thirdparty/hedley/hedley_undef.hpp
include/nlohmann/thirdparty/hedley/hedley_undef.hpp
+0
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+0
-1
No files found.
Makefile
View file @
025f4cea
...
...
@@ -621,5 +621,5 @@ update_hedley:
rm
-f
include/nlohmann/thirdparty/hedley/hedley.hpp include/nlohmann/thirdparty/hedley/hedley_undef.hpp
curl https://raw.githubusercontent.com/nemequ/hedley/master/hedley.h
-o
include/nlohmann/thirdparty/hedley/hedley.hpp
gsed
-i
's/HEDLEY_/NLOHMANN_JSON_HEDLEY_/g'
include/nlohmann/thirdparty/hedley/hedley.hpp
grep
"[[:blank:]]*#[[:blank:]]*undef"
include/nlohmann/thirdparty/hedley/hedley.hpp |
sort
|
uniq
| gsed
's/ //g'
| gsed
's/undef/undef /g'
>
include/nlohmann/thirdparty/hedley/hedley_undef.hpp
grep
"[[:blank:]]*#[[:blank:]]*undef"
include/nlohmann/thirdparty/hedley/hedley.hpp |
grep
-v
"__"
|
sort
|
uniq
| gsed
's/ //g'
| gsed
's/undef/undef /g'
>
include/nlohmann/thirdparty/hedley/hedley_undef.hpp
$(MAKE)
amalgamate
include/nlohmann/thirdparty/hedley/hedley_undef.hpp
View file @
025f4cea
...
...
@@ -119,4 +119,3 @@
#undef NLOHMANN_JSON_HEDLEY_VERSION_ENCODE
#undef NLOHMANN_JSON_HEDLEY_WARNING
#undef NLOHMANN_JSON_HEDLEY_WARN_UNUSED_RESULT
#undef NLOHMANN_JSON_HEDLEY__IS_CONSTEXPR
single_include/nlohmann/json.hpp
View file @
025f4cea
...
...
@@ -22564,7 +22564,6 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
#undef NLOHMANN_JSON_HEDLEY_VERSION_ENCODE
#undef NLOHMANN_JSON_HEDLEY_WARNING
#undef NLOHMANN_JSON_HEDLEY_WARN_UNUSED_RESULT
#undef NLOHMANN_JSON_HEDLEY__IS_CONSTEXPR
...
...
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