Skip to content
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.

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

Replace rapidjson to nlohmann json #58

Merged
merged 127 commits into from
Jan 16, 2019
Merged
Show file tree
Hide file tree
Changes from 124 commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
b643c1f
committing files to replace rapidjson to nlohmann. TO BE DISCUSSED, n…
RiccardoRossi Feb 15, 2017
c32544c
committing files to replace rapidjson to nlohmann. TO BE DISCUSSED, n…
RiccardoRossi Feb 15, 2017
5af2320
Merge branch 'replace-rapidjson-to-nlohmann-json' of https://github.c…
RiccardoRossi Feb 15, 2017
b00a734
adding a small test and correcting an error.
RiccardoRossi Feb 16, 2017
c1178de
passing strings as const reference and adding better support for prin…
RiccardoRossi Feb 16, 2017
8be9068
merging the master branch into my local branchMerge branch 'master' i…
RiccardoRossi Feb 16, 2017
add040e
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
RiccardoRossi Feb 16, 2017
ebfa4f1
merging master into local branch prior to committing
RiccardoRossi Feb 16, 2017
befcfe3
Merge branch 'master' of https://github.com/KratosMultiphysics/Kratos…
RiccardoRossi Feb 16, 2017
81d23fc
updating nlohmann library to an upgraded version with a bug correction
RiccardoRossi Feb 21, 2017
3d6440f
adding iterators
RiccardoRossi Feb 23, 2017
9254ff7
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Sep 13, 2018
9f644e0
Update to version 3.2.0
loumalouomega Sep 13, 2018
fce33a8
Adding description
loumalouomega Sep 13, 2018
b0d21d0
Version that can be compiled (not working tests yet)
loumalouomega Sep 13, 2018
33c7344
Documenting (WIP)
loumalouomega Sep 13, 2018
e68b0cc
More documentation
loumalouomega Sep 13, 2018
61da926
Several addings
loumalouomega Sep 13, 2018
58d5d48
Minor
loumalouomega Sep 13, 2018
543ba53
Missing methods
loumalouomega Sep 13, 2018
ab2f7e6
More doc
loumalouomega Sep 14, 2018
5898c9f
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Sep 14, 2018
7beb535
Some more methods
loumalouomega Sep 14, 2018
3eedefb
Advances
loumalouomega Sep 14, 2018
9f8e4de
More methods
loumalouomega Sep 14, 2018
51446c1
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Sep 15, 2018
186a0c7
Missing check + documentation
loumalouomega Sep 15, 2018
8066668
Commenting not working tests
loumalouomega Sep 15, 2018
65b88bc
Minor
loumalouomega Sep 15, 2018
523fc23
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Sep 16, 2018
a38387e
Adding items()
loumalouomega Sep 16, 2018
9761263
Const items()
loumalouomega Sep 16, 2018
2846826
Minor
loumalouomega Sep 16, 2018
ee81211
Commenting assert that doesn't allow to use end() iterators
loumalouomega Sep 16, 2018
4421112
Activating one more test
loumalouomega Sep 16, 2018
3b18835
One more test
loumalouomega Sep 16, 2018
2042065
One more test
loumalouomega Sep 16, 2018
07929fd
More test
loumalouomega Sep 16, 2018
4bacbdf
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Sep 20, 2018
9dbd3c7
Reverting assert (we need to search for an alternative solution)
loumalouomega Sep 20, 2018
2faad2f
Deactivating again asserts
loumalouomega Sep 20, 2018
af847c3
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Sep 23, 2018
57c9dc3
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Sep 25, 2018
1e818f1
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Sep 25, 2018
3859524
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Oct 1, 2018
d5bd77f
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Oct 1, 2018
6ccf5b1
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Oct 9, 2018
e8b9bff
Mod copy constructor
loumalouomega Oct 9, 2018
b1d623e
New constructor
loumalouomega Oct 9, 2018
a650e75
Changes
loumalouomega Oct 9, 2018
53841fe
Reverting asserts
loumalouomega Oct 9, 2018
bbdd35f
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Oct 12, 2018
d18ee20
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Oct 14, 2018
16df96e
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Oct 20, 2018
7321544
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Oct 22, 2018
29b373d
Update to 3.30
loumalouomega Oct 22, 2018
273f369
Adding auxiliar methods
loumalouomega Oct 23, 2018
f63a9ea
Minor
loumalouomega Oct 23, 2018
2d8216a
Using the is end method
loumalouomega Oct 23, 2018
8a1f314
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Oct 23, 2018
65d6417
Revert "Minor"
loumalouomega Oct 23, 2018
6ab0bb3
Revert "Adding auxiliar methods"
loumalouomega Oct 23, 2018
cb0953e
Solvimg problem just using a reference
loumalouomega Oct 23, 2018
d8e4ec0
Wrong array filling
loumalouomega Oct 23, 2018
5a1e0f5
Activating one test more
loumalouomega Oct 23, 2018
3d490af
Recursively assign
loumalouomega Oct 23, 2018
f4f712a
Final test active
loumalouomega Oct 23, 2018
20aefd9
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Oct 23, 2018
3f2bebb
Checking if number instead of integer or double
loumalouomega Oct 23, 2018
cf3cb60
Correction on ValidateAndAssignDefaults
loumalouomega Oct 24, 2018
d87d796
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Oct 24, 2018
ab50333
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Oct 25, 2018
d168cd3
Duplicated default value
loumalouomega Oct 25, 2018
d4e4015
make_shared
loumalouomega Oct 25, 2018
b91a9ed
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Oct 26, 2018
a7c7fee
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Oct 27, 2018
51ac578
Adding serializer according to #3207
loumalouomega Oct 27, 2018
1417b3d
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Oct 29, 2018
59787ee
https://github.com/nlohmann/json/issues/1319 fixed
loumalouomega Oct 30, 2018
c344acb
3.4 stable release
loumalouomega Oct 30, 2018
0efbe46
3.4 Readme.md
loumalouomega Oct 30, 2018
91a1865
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Oct 30, 2018
4de3e03
Test -j4 -> -j2
loumalouomega Oct 31, 2018
f1ac6da
Revert "Test -j4 -> -j2"
loumalouomega Oct 31, 2018
a910222
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Nov 1, 2018
451e5ca
Minor
loumalouomega Nov 1, 2018
762d36e
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Nov 6, 2018
aa1e50d
fix compiler error
philbucher Nov 6, 2018
9eaf732
Using multiple include
loumalouomega Nov 6, 2018
abfa6a1
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
philbucher Nov 6, 2018
30816d4
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Nov 7, 2018
667640a
Merge remote-tracking branch 'origin/replace-rapidjson-to-nlohmann-js…
loumalouomega Nov 7, 2018
0d86ad5
Revert "Using multiple include"
loumalouomega Nov 6, 2018
74ed8c2
Trying 3.2
loumalouomega Nov 7, 2018
545eed8
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Nov 10, 2018
0b5294f
Update library
loumalouomega Nov 10, 2018
1f260fd
Trying out #pragma once
loumalouomega Nov 10, 2018
4d64c67
Revert "Trying out #pragma once"
loumalouomega Nov 10, 2018
77dfb33
Moving to a cpp
loumalouomega Nov 11, 2018
21606fc
Missing
loumalouomega Nov 11, 2018
2844016
Missing KRATOS_API(KRATOS_CORE)
loumalouomega Nov 11, 2018
78cc0cb
Appveyor problem
loumalouomega Nov 11, 2018
b539e15
Adding json_fwd
loumalouomega Nov 11, 2018
258409e
Forward declaration transition
loumalouomega Nov 11, 2018
8aea9f8
Using distance intead iterator. Toward forward declaration
loumalouomega Nov 12, 2018
31a4ff0
Merge branch 'master' into core/replace-json-nlohman-forward-declaration
loumalouomega Nov 12, 2018
1b6542d
Moving again to cpp
loumalouomega Nov 12, 2018
d403719
Using forward declaration
loumalouomega Nov 12, 2018
7fa2be2
Merge branch 'master' into core/replace-json-nlohman-forward-declaration
loumalouomega Nov 12, 2018
3180eb0
Adding exclude on COTIRE
loumalouomega Nov 12, 2018
063f67a
Correction in exclude
loumalouomega Nov 13, 2018
82b2bd5
Missing API in subclasses
loumalouomega Nov 13, 2018
ff36fec
Merge branch 'master' into core/replace-json-nlohman-forward-declaration
loumalouomega Nov 13, 2018
1d692b5
Merge branch 'master' into core/replace-json-nlohman-forward-declaration
loumalouomega Nov 13, 2018
d922c37
Merge branch 'master' into core/replace-json-nlohman-forward-declaration
loumalouomega Nov 16, 2018
b9d699b
Correcting empty constructor
loumalouomega Nov 17, 2018
9b21e23
Adding move operator
loumalouomega Nov 17, 2018
ad3603e
Move constructor
loumalouomega Nov 17, 2018
558c268
Silencing duplicated data info
loumalouomega Nov 17, 2018
dadfb7c
Update cpp test
loumalouomega Nov 17, 2018
5162f2b
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Nov 17, 2018
e7cc9e8
Avoid conflict
loumalouomega Dec 11, 2018
d2939e7
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Dec 11, 2018
b13f852
Solve conflict
loumalouomega Dec 11, 2018
2bc2303
Revert Parameters::const_iterator
loumalouomega Dec 12, 2018
4a996ec
Merge branch 'master' into replace-rapidjson-to-nlohmann-json
loumalouomega Dec 30, 2018
7c55e1f
Adding const methods
loumalouomega Dec 30, 2018
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
1,267 changes: 1,267 additions & 0 deletions external_libraries/json/README.md

Large diffs are not rendered by default.

20,283 changes: 20,283 additions & 0 deletions external_libraries/json/json.hpp

Large diffs are not rendered by default.

79 changes: 79 additions & 0 deletions external_libraries/json/json_fwd.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
#ifndef NLOHMANN_JSON_FWD_HPP
#define NLOHMANN_JSON_FWD_HPP

#include <cstdint> // int64_t, uint64_t
#include <map> // map
#include <memory> // allocator
#include <string> // string
#include <vector> // vector

/*!
@brief namespace for Niels Lohmann
@see https://github.com/nlohmann
@since version 1.0.0
*/
namespace nlohmann
{
/*!
@brief default JSONSerializer template argument

This serializer ignores the template arguments and uses ADL
([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
for serialization.
*/
template<typename T = void, typename SFINAE = void>
struct adl_serializer;

template<template<typename U, typename V, typename... Args> class ObjectType =
std::map,
template<typename U, typename... Args> class ArrayType = std::vector,
class StringType = std::string, class BooleanType = bool,
class NumberIntegerType = std::int64_t,
class NumberUnsignedType = std::uint64_t,
class NumberFloatType = double,
template<typename U> class AllocatorType = std::allocator,
template<typename T, typename SFINAE = void> class JSONSerializer =
adl_serializer>
class basic_json;

/*!
@brief JSON Pointer

A JSON pointer defines a string syntax for identifying a specific value
within a JSON document. It can be used with functions `at` and
`operator[]`. Furthermore, JSON pointers are the base for JSON patches.

@sa [RFC 6901](https://tools.ietf.org/html/rfc6901)

@since version 2.0.0
*/
template<typename BasicJsonType>
class json_pointer;

/*!
@brief default JSON class

This type is the default specialization of the @ref basic_json class which
uses the standard template types.

@since version 1.0.0
*/
using json = basic_json<>;

/*!
@brief namespace for Niels Lohmann detail
@see https://github.com/nlohmann
@since version 1.0.0
*/
namespace detail
{
template<typename BasicJsonType>
class iter_impl;

template<typename IteratorType>
class iteration_proxy;
} // namespace detail

} // namespace nlohmann

#endif
261 changes: 0 additions & 261 deletions external_libraries/rapidjson/allocators.h

This file was deleted.

Loading