include/utils/SkJSONCPP.h - Issue 2184483003: Move SkJSONCPP.h to tools. It tool-only.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side 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, 4 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:

OLD	NEW
	(Empty)
1 /*

2 * Copyright 2013 Google Inc.

3 *

4 * Use of this source code is governed by a BSD-style license that can be

5 * found in the LICENSE file.

6 *

7 * A common place to put the jsoncpp library includes, as opposed to littering

8 * the pragmas repeatedly through our code.

9 */

10 #ifndef SkJSONCPP_DEFINED

11 #define SkJSONCPP_DEFINED

12

13 #ifdef GOOGLE3

14 #include "third_party/jsoncpp/reader.h"

15 #include "third_party/jsoncpp/value.h"

16 #include "third_party/jsoncpp/writer.h"

17 #else

18 #ifdef SK_BUILD_FOR_WIN

19 // json includes xlocale which generates warning 4530 because we're

20 // compiling without exceptions;

21 // see https://code.google.com/p/skia/issues/detail?id=1067

22 #pragma warning(push)

23 #pragma warning(disable : 4530)

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

31 #endif

32

33 #endif // SkJSONCPP_DEFINED

OLD	NEW

« no previous file with comments | « cmake/CMakeLists.txt ('k') | tools/SkJSONCPP.h » ('j') | no next file with comments »