Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Simox
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

22376fb9

Commit 22376fb9 authored 3 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'json-api' into 'master'

Make JSON API usable without using the name nlohmann::json

See merge request Simox/simox!81

parents 7bd0ddb2 6db175db

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

SimoxUtility/CMakeLists.txt 3 additions, 0 deletions

SimoxUtility/CMakeLists.txt
SimoxUtility/json.h 2 additions, 0 deletions

SimoxUtility/json.h
SimoxUtility/json/converters.cpp 6 additions, 6 deletions

SimoxUtility/json/converters.cpp
SimoxUtility/json/converters.h 4 additions, 4 deletions

SimoxUtility/json/converters.h
SimoxUtility/json/eigen_conversion.cpp 2 additions, 2 deletions

SimoxUtility/json/eigen_conversion.cpp
SimoxUtility/json/eigen_conversion.h 20 additions, 19 deletions

SimoxUtility/json/eigen_conversion.h
SimoxUtility/json/error.cpp 27 additions, 0 deletions

SimoxUtility/json/error.cpp
SimoxUtility/json/error.h 45 additions, 0 deletions

SimoxUtility/json/error.h
SimoxUtility/json/io.cpp 57 additions, 25 deletions

SimoxUtility/json/io.cpp
SimoxUtility/json/io.h 87 additions, 10 deletions

SimoxUtility/json/io.h
SimoxUtility/json/json.h 10 additions, 0 deletions

SimoxUtility/json/json.h
SimoxUtility/json/util.cpp 2 additions, 1 deletion

SimoxUtility/json/util.cpp
SimoxUtility/json/util.h 5 additions, 3 deletions

SimoxUtility/json/util.h
SimoxUtility/tests/json/IOTest.cpp 11 additions, 10 deletions

SimoxUtility/tests/json/IOTest.cpp

with 281 additions and 80 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment