Codechange: vendor the nlohmann-json library (#11290)

(cherry picked from commit ba67f39db6)

# Conflicts:
#	.github/workflows/ci-build.yml
#	CMakeLists.txt
#	COMPILING.md
#	src/os/macosx/survey_osx.cpp
#	src/os/windows/survey_win.cpp
#	src/script/api/script_admin.cpp
#	src/script/api/script_event_types.cpp
#	src/tests/test_script_admin.cpp
This commit is contained in:
Jonathan G Rennison
2023-11-17 19:20:35 +00:00
parent af1150182a
commit cf4cf5c08f
20 changed files with 24631 additions and 141 deletions

View File

@@ -10,10 +10,10 @@
#include "../../stdafx.h"
#include "../../core/format.hpp"
#include "../../3rdparty/nlohmann/json.hpp"
#include "macos.h"
#include <mach-o/arch.h>
#include <nlohmann/json.hpp>
#include <thread>
#include "../../safeguards.h"

View File

@@ -9,7 +9,8 @@
#include "../../stdafx.h"
#include <nlohmann/json.hpp>
#include "../../3rdparty/nlohmann/json.hpp"
#include <sys/utsname.h>
#include <thread>
#include <unistd.h>

View File

@@ -10,8 +10,8 @@
#include "../../stdafx.h"
#include "../../core/format.hpp"
#include "../../3rdparty/nlohmann/json.hpp"
#include <nlohmann/json.hpp>
#include <thread>
#include <windows.h>