j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

✨ added define for library version #948 #943

Browse source
This commit is contained in:
Niels Lohmann 2018-01-31 22:36:18 +01:00
parent 552d153842
commit e8bf1f62f7
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
develop/json.hpp
View file

@ -29,6 +29,10 @@ SOFTWARE.
#ifndef NLOHMANN_JSON_HPP #ifndef NLOHMANN_JSON_HPP
#define NLOHMANN_JSON_HPP #define NLOHMANN_JSON_HPP
#define NLOHMANN_JSON_VERSION_MAJOR 3
#define NLOHMANN_JSON_VERSION_MINOR 0
#define NLOHMANN_JSON_VERSION_PATCH 1
#include <algorithm> // all_of, find, for_each #include <algorithm> // all_of, find, for_each
#include <cassert> // assert #include <cassert> // assert
#include <ciso646> // and, not, or #include <ciso646> // and, not, or
@ -308,10 +312,13 @@ class basic_json
result["copyright"] = "(C) 2013-2017 Niels Lohmann"; result["copyright"] = "(C) 2013-2017 Niels Lohmann";
result["name"] = "JSON for Modern C++"; result["name"] = "JSON for Modern C++";
result["url"] = "https://github.com/nlohmann/json"; result["url"] = "https://github.com/nlohmann/json";
result["version"] = result["version"]["string"] =
{ std::to_string(NLOHMANN_JSON_VERSION_MAJOR) + "." +
{"string", "3.0.1"}, {"major", 3}, {"minor", 0}, {"patch", 1} std::to_string(NLOHMANN_JSON_VERSION_MINOR) + "." +
}; std::to_string(NLOHMANN_JSON_VERSION_PATCH);
result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
#ifdef _WIN32 #ifdef _WIN32
result["platform"] = "win32"; result["platform"] = "win32";

15
src/json.hpp
View file

@ -29,6 +29,10 @@ SOFTWARE.
#ifndef NLOHMANN_JSON_HPP #ifndef NLOHMANN_JSON_HPP
#define NLOHMANN_JSON_HPP #define NLOHMANN_JSON_HPP
#define NLOHMANN_JSON_VERSION_MAJOR 3
#define NLOHMANN_JSON_VERSION_MINOR 0
#define NLOHMANN_JSON_VERSION_PATCH 1
#include <algorithm> // all_of, find, for_each #include <algorithm> // all_of, find, for_each
#include <cassert> // assert #include <cassert> // assert
#include <ciso646> // and, not, or #include <ciso646> // and, not, or
@ -9885,10 +9889,13 @@ class basic_json
result["copyright"] = "(C) 2013-2017 Niels Lohmann"; result["copyright"] = "(C) 2013-2017 Niels Lohmann";
result["name"] = "JSON for Modern C++"; result["name"] = "JSON for Modern C++";
result["url"] = "https://github.com/nlohmann/json"; result["url"] = "https://github.com/nlohmann/json";
result["version"] = result["version"]["string"] =
{ std::to_string(NLOHMANN_JSON_VERSION_MAJOR) + "." +
{"string", "3.0.1"}, {"major", 3}, {"minor", 0}, {"patch", 1} std::to_string(NLOHMANN_JSON_VERSION_MINOR) + "." +
}; std::to_string(NLOHMANN_JSON_VERSION_PATCH);
result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
#ifdef _WIN32 #ifdef _WIN32
result["platform"] = "win32"; result["platform"] = "win32";