Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: include/utils/SkJSONCPP.h

Issue 2184483003: Move SkJSONCPP.h to tools. It tool-only. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: update cmake Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cmake/CMakeLists.txt ('k') | tools/SkJSONCPP.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/utils/SkJSONCPP.h
diff --git a/include/utils/SkJSONCPP.h b/include/utils/SkJSONCPP.h
deleted file mode 100644
index 6baf223610d6be5f8d8696c5f1115769025bb8fe..0000000000000000000000000000000000000000
--- a/include/utils/SkJSONCPP.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * A common place to put the jsoncpp library includes, as opposed to littering
- * the pragmas repeatedly through our code.
- */
-#ifndef SkJSONCPP_DEFINED
-#define SkJSONCPP_DEFINED
-
-#ifdef GOOGLE3
- #include "third_party/jsoncpp/reader.h"
- #include "third_party/jsoncpp/value.h"
- #include "third_party/jsoncpp/writer.h"
-#else
- #ifdef SK_BUILD_FOR_WIN
- // json includes xlocale which generates warning 4530 because we're
- // compiling without exceptions;
- // see https://code.google.com/p/skia/issues/detail?id=1067
- #pragma warning(push)
- #pragma warning(disable : 4530)
- #endif
- #include "json/reader.h"
- #include "json/value.h"
- #include "json/writer.h"
- #ifdef SK_BUILD_FOR_WIN
- #pragma warning(pop)
- #endif
-#endif
-
-#endif // SkJSONCPP_DEFINED
« no previous file with comments | « cmake/CMakeLists.txt ('k') | tools/SkJSONCPP.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698