diff options
Diffstat (limited to 'src/web_service')
| -rw-r--r-- | src/web_service/json.h | 18 | ||||
| -rw-r--r-- | src/web_service/telemetry_json.h | 2 | ||||
| -rw-r--r-- | src/web_service/verify_login.cpp | 2 |
3 files changed, 2 insertions, 20 deletions
diff --git a/src/web_service/json.h b/src/web_service/json.h deleted file mode 100644 index 88b31501e..000000000 --- a/src/web_service/json.h +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | // Copyright 2018 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #pragma once | ||
| 6 | |||
| 7 | // This hack is needed to support json.hpp on platforms where the C++17 stdlib | ||
| 8 | // lacks std::string_view. See https://github.com/nlohmann/json/issues/735. | ||
| 9 | // clang-format off | ||
| 10 | #if !__has_include(<string_view>) && __has_include(<experimental/string_view>) | ||
| 11 | # include <experimental/string_view> | ||
| 12 | # define string_view experimental::string_view | ||
| 13 | # include <json.hpp> | ||
| 14 | # undef string_view | ||
| 15 | #else | ||
| 16 | # include <json.hpp> | ||
| 17 | #endif | ||
| 18 | // clang-format on | ||
diff --git a/src/web_service/telemetry_json.h b/src/web_service/telemetry_json.h index 29d565964..0fe6f9a3e 100644 --- a/src/web_service/telemetry_json.h +++ b/src/web_service/telemetry_json.h | |||
| @@ -6,9 +6,9 @@ | |||
| 6 | 6 | ||
| 7 | #include <array> | 7 | #include <array> |
| 8 | #include <string> | 8 | #include <string> |
| 9 | #include <json.hpp> | ||
| 9 | #include "common/telemetry.h" | 10 | #include "common/telemetry.h" |
| 10 | #include "common/web_result.h" | 11 | #include "common/web_result.h" |
| 11 | #include "web_service/json.h" | ||
| 12 | 12 | ||
| 13 | namespace WebService { | 13 | namespace WebService { |
| 14 | 14 | ||
diff --git a/src/web_service/verify_login.cpp b/src/web_service/verify_login.cpp index 02e1b74f3..124aa3863 100644 --- a/src/web_service/verify_login.cpp +++ b/src/web_service/verify_login.cpp | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "web_service/json.h" | 5 | #include <json.hpp> |
| 6 | #include "web_service/verify_login.h" | 6 | #include "web_service/verify_login.h" |
| 7 | #include "web_service/web_backend.h" | 7 | #include "web_service/web_backend.h" |
| 8 | 8 | ||