summaryrefslogtreecommitdiffstats
path: root/src/web_service
diff options
context:
space:
mode:
authorfearlessTobi <thm.frey@gmail.com>2018-09-19 20:04:45 +0200
committerfearlessTobi <thm.frey@gmail.com>2018-10-02 15:30:48 +0200
commitaa484688623db59df3ef334a63eff98d98e362f3 (patch)
tree23c2ccdbe5e562e281e1e96d306036f724856461 /src/web_service
parentweb_backend: protect jwt cache with a mutex (diff)
downloadyuzu-aa484688623db59df3ef334a63eff98d98e362f3.tar
yuzu-aa484688623db59df3ef334a63eff98d98e362f3.tar.gz
yuzu-aa484688623db59df3ef334a63eff98d98e362f3.tar.bz2
yuzu-aa484688623db59df3ef334a63eff98d98e362f3.tar.lz
yuzu-aa484688623db59df3ef334a63eff98d98e362f3.tar.xz
yuzu-aa484688623db59df3ef334a63eff98d98e362f3.tar.zst
yuzu-aa484688623db59df3ef334a63eff98d98e362f3.zip
Diffstat (limited to 'src/web_service')
-rw-r--r--src/web_service/json.h18
-rw-r--r--src/web_service/telemetry_json.h2
-rw-r--r--src/web_service/verify_login.cpp2
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 @@
-// Copyright 2018 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-// This hack is needed to support json.hpp on platforms where the C++17 stdlib
-// lacks std::string_view. See https://github.com/nlohmann/json/issues/735.
-// clang-format off
-#if !__has_include(<string_view>) && __has_include(<experimental/string_view>)
-# include <experimental/string_view>
-# define string_view experimental::string_view
-# include <json.hpp>
-# undef string_view
-#else
-# include <json.hpp>
-#endif
-// 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 @@
#include <array>
#include <string>
+#include <json.hpp>
#include "common/telemetry.h"
#include "common/web_result.h"
-#include "web_service/json.h"
namespace WebService {
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 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "web_service/json.h"
+#include <json.hpp>
#include "web_service/verify_login.h"
#include "web_service/web_backend.h"