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

Side by Side Diff: include/utils/SkJSONCPP.h

Issue 853613002: upstream google3 include paths for jsoncpp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 * 6 *
7 * A common place to put the jsoncpp library includes, as opposed to littering 7 * A common place to put the jsoncpp library includes, as opposed to littering
8 * the pragmas repeatedly through our code. 8 * the pragmas repeatedly through our code.
9 */ 9 */
10 #ifndef SkJSONCPP_DEFINED 10 #ifndef SkJSONCPP_DEFINED
11 #define SkJSONCPP_DEFINED 11 #define SkJSONCPP_DEFINED
12 12
13 #ifdef SK_BUILD_FOR_WIN 13 #ifdef GOOGLE3
14 // json includes xlocale which generates warning 4530 because we're 14 #include "third_party/jsoncpp/reader.h"
15 // compiling without exceptions; 15 #include "third_party/jsoncpp/value.h"
16 // see https://code.google.com/p/skia/issues/detail?id=1067 16 #include "third_party/jsoncpp/writer.h"
17 #pragma warning(push) 17 #else
18 #pragma warning(disable : 4530) 18 #ifdef SK_BUILD_FOR_WIN
19 #endif 19 // json includes xlocale which generates warning 4530 because we're
20 #include "json/reader.h" 20 // compiling without exceptions;
21 #include "json/value.h" 21 // see https://code.google.com/p/skia/issues/detail?id=1067
22 #include "json/writer.h" 22 #pragma warning(push)
23 #ifdef SK_BUILD_FOR_WIN 23 #pragma warning(disable : 4530)
24 #pragma warning(pop) 24 #endif
25 #include "json/reader.h"
26 #include "json/value.h"
27 #include "json/writer.h"
28 #ifdef SK_BUILD_FOR_WIN
29 #pragma warning(pop)
30 #endif
25 #endif 31 #endif
26 32
27 #endif // SkJSONCPP_DEFINED 33 #endif // SkJSONCPP_DEFINED
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698