Commit 4ed6d8dd06ff640895a2f4a21f2559a4c53936a4 - mozc

+2

-0

src/base/file_stream.h less more

35	35	#else // MOZC_USE_PEPPER_FILE_IO
36	36	#include <fstream>
37	37	#endif // MOZC_USE_PEPPER_FILE_IO
	38
	39	#include "base/port_string.h"
38	40
39	41	namespace mozc {
40	42

+0

-1

src/base/logging.h less more

34	34	#include <string>
35	35
36	36	#include "base/flags.h"
37		#include "base/namespace.h"
38	37	#include "base/port.h"
39	38
40	39	namespace mozc {

+2

-0

src/base/mac_process.h less more

31	31
32	32	#include <string>
33	33
	34	#include "base/port_string.h"
	35
34	36	#ifdef OS_MACOSX
35	37	namespace mozc {
36	38	class MacProcess {

+0

-36

~~src/base/namespace.h~~ less more

0		// Copyright 2010-2018, Google Inc.
1		// All rights reserved.
2		//
3		// Redistribution and use in source and binary forms, with or without
4		// modification, are permitted provided that the following conditions are
5		// met:
6		//
7		// * Redistributions of source code must retain the above copyright
8		// notice, this list of conditions and the following disclaimer.
9		// * Redistributions in binary form must reproduce the above
10		// copyright notice, this list of conditions and the following disclaimer
11		// in the documentation and/or other materials provided with the
12		// distribution.
13		// * Neither the name of Google Inc. nor the names of its
14		// contributors may be used to endorse or promote products derived from
15		// this software without specific prior written permission.
16		//
17		// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
18		// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
19		// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
20		// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
21		// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
22		// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
23		// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24		// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25		// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26		// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27		// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
29		#ifndef MOZC_BASE_NAMESPACE_H_
30		#define MOZC_BASE_NAMESPACE_H_
31		#ifdef __cplusplus
32		namespace std {}
33		using namespace std;
34		#endif // __cplusplus
35		#endif // MOZC_BASE_NAMESPACE_H_

+2

-0

src/base/port.h less more

28	28
29	29	#ifndef MOZC_BASE_PORT_H_
30	30	#define MOZC_BASE_PORT_H_
	31
	32	#include "base/port_string.h"
31	33
32	34	// Check duplicate OS_XXX definition.
33	35

+39

-0

src/base/port_string.h less more

	0	// Copyright 2010-2018, Google Inc.
	1	// All rights reserved.
	2	//
	3	// Redistribution and use in source and binary forms, with or without
	4	// modification, are permitted provided that the following conditions are
	5	// met:
	6	//
	7	// * Redistributions of source code must retain the above copyright
	8	// notice, this list of conditions and the following disclaimer.
	9	// * Redistributions in binary form must reproduce the above
	10	// copyright notice, this list of conditions and the following disclaimer
	11	// in the documentation and/or other materials provided with the
	12	// distribution.
	13	// * Neither the name of Google Inc. nor the names of its
	14	// contributors may be used to endorse or promote products derived from
	15	// this software without specific prior written permission.
	16	//
	17	// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	18	// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	19	// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
	20	// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
	21	// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
	22	// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
	23	// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
	24	// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
	25	// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	26	// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
	27	// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	28
	29	#ifndef MOZC_BASE_PORT_STRING_H_
	30	#define MOZC_BASE_PORT_STRING_H_
	31
	32	#include <string>
	33
	34	#ifndef HAS_GLOBAL_STRING
	35	using std::string;
	36	#endif // HAS_GLOBAL_STRING
	37
	38	#endif // MOZC_BASE_PORT_STRING_H_

+1

-1

src/base/string_piece.h less more

39	39	#include <string>
40	40
41	41	// Include namespace.h instead of port.h to reduce a dependency.
42		#include "base/namespace.h"
	42	#include "base/port_string.h"
43	43
44	44	namespace mozc {
45	45

+3

-1

src/composer/internal/mode_switching_handler.h less more

35	35	#include <map>
36	36	#include <string>
37	37	#include <utility>
	38
	39	#include "base/port_string.h"
38	40
39	41	namespace mozc {
40	42	namespace composer {

75	77	const ModeSwitching display_mode,
76	78	const ModeSwitching input_mode);
77	79
78		// map<key, pair<display_mode, input_mode> >.
	80	// map<key, pair<display_mode, input_mode>>.
79	81	std::map<string, std::pair<ModeSwitching, ModeSwitching>> patterns_;
80	82	};
81	83

+2

-0

src/composer/internal/transliterator_interface.h less more

30	30	#define MOZC_COMPOSER_INTERNAL_TRANSLITERATOR_INTERFACE_H_
31	31
32	32	#include <string>
	33
	34	#include "base/port_string.h"
33	35
34	36	namespace mozc {
35	37	namespace composer {

+1

-1

src/data/version/mozc_version_template.bzl less more

29	29
30	30	MAJOR=2
31	31	MINOR=23
32		BUILD=2805
	32	BUILD=2806
33	33	REVISION=102
34	34	# This version represents the version of Mozc IME engine (converter, predictor,
35	35	# etc.). This version info is included both in the Mozc server and in the Mozc

+2

-0

src/engine/user_data_manager_interface.h less more

35	35
36	36	#include <string>
37	37
	38	#include "base/port_string.h"
	39
38	40	namespace mozc {
39	41
40	42	class UserDataManagerInterface {

+3

-1

src/gyp/common.gypi less more

69	69	'-Wno-deprecated-declarations',
70	70	'-Wwrite-strings',
71	71	'<@(extra_warning_cflags)',
	72
	73	'-Wno-unknown-warning-option',
	74	'-Wno-inconsistent-missing-override',
72	75	],
73	76
74	77	# gcc_cflags will be shared with Mac and Linux

76	79	'-fmessage-length=0',
77	80	'-fno-strict-aliasing',
78	81	'-funsigned-char',
79		'-include base/namespace.h',
80	82	'-pipe',
81	83	'-pthread',
82	84	],

+0

-2

src/gyp/common_win.gypi less more

319	319	'EnableFunctionLevelLinking': 'true', # /Gy
320	320	'EnableIntrinsicFunctions': 'true', # /Oi
321	321	'ExceptionHandling': '2', # /EHs
322		'ForcedIncludeFiles': ['base/namespace.h'],
323		# /FI<header_file.h>
324	322	'SuppressStartupBanner': 'true', # /nologo
325	323	'TreatWChar_tAsBuiltInType': 'false', # /Zc:wchar_t-
326	324	'WarningLevel': '3', # /W3

+4

-0

src/mac/GoogleJapaneseInputController.h less more

28	28
29	29	#import <InputMethodKit/InputMethodKit.h>
30	30	#import "mac/common.h"
	31
	32	#include <string>
	33
	34	#include "base/port_string.h"
31	35
32	36	// For mozc::commands::CompositionMode
33	37	#include "protocol/renderer_command.pb.h"

+2

-0

src/prediction/predictor_interface.h less more

30	30	#define MOZC_PREDICTION_PREDICTOR_INTERFACE_H_
31	31
32	32	#include <string>
	33
	34	#include "base/port_string.h"
33	35
34	36	namespace mozc {
35	37

+4

-0

src/renderer/mac/mac_view_util.h less more

30	30	#define MOZC_RENDERER_MAC_MAC_VIEW_UTIL_H_
31	31
32	32	#import <Cocoa/Cocoa.h>
	33
	34	#include <string>
	35
33	36	#include "base/coordinates.h"
	37	#include "base/port_string.h"
34	38	#include "protocol/renderer_style.pb.h"
35	39
36	40	namespace mozc {

+2

-0

src/renderer/unix/pango_wrapper_interface.h less more

31	31
32	32	#include <gtk/gtk.h>
33	33	#include <string>
	34
	35	#include "base/port_string.h"
34	36
35	37	namespace mozc {
36	38

+2

-0

src/rewriter/calculator/calculator_interface.h less more

31	31
32	32	#include <string>
33	33
	34	#include "base/port_string.h"
	35
34	36	namespace mozc {
35	37
36	38	class CalculatorInterface {

+2

-0

src/rewriter/gen_existence_data.h less more

33	33	#include <string>
34	34	#include <vector>
35	35
	36	#include "base/port_string.h"
	37
36	38	namespace mozc {
37	39
38	40	void OutputExistenceHeader(const std::vector<string> &entries,

+0

-7

src/testing/testing.gyp less more

115	115	],
116	116	}],
117	117	],
118		'xcode_settings': {
119		# Remove the force included file. This is not necessary for third
120		# party libraries, and it causes a build error.
121		'OTHER_CFLAGS!' : [
122		'-include base/namespace.h',
123		],
124		},
125	118	},
126	119	{
127	120	'target_name': 'gen_mozc_data_dir_header',

+2

-0

src/unix/ibus/path_util.h less more

31	31
32	32	#include <string>
33	33
	34	#include "base/port_string.h"
	35
34	36	namespace mozc {
35	37	namespace ibus {
36	38