Skip to content

Commit 6a027e9

Browse files
committed
Remove an obsolete workaround for Visual C++ 2012.
BUG= TEST=unittest REF_BUG=18970800,19010851 REF_CL=84938187
1 parent 26d5e5b commit 6a027e9

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

src/base/util.cc

+1-8
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
#include <utility>
6161
#include <vector>
6262

63-
#include "base/compiler_specific.h"
6463
#include "base/double_array.h"
6564
#include "base/japanese_util_rule.h"
6665
#include "base/logging.h"
@@ -69,15 +68,8 @@
6968
#include "base/singleton.h"
7069
#include "base/string_piece.h"
7170

72-
7371
namespace {
7472

75-
#if MOZC_MSVC_VERSION_LT(18, 0)
76-
void va_copy(va_list &a, va_list &b) {
77-
a = b;
78-
}
79-
#endif // Visual C++ 2012 and prior
80-
8173
// Lower-level routine that takes a va_list and appends to a specified
8274
// string. All other routines of sprintf family are just convenience
8375
// wrappers around it.
@@ -125,6 +117,7 @@ void StringAppendV(string *dst, const char *format, va_list ap) {
125117
delete[] buf;
126118
}
127119
}
120+
128121
} // namespace
129122

130123
namespace mozc {

src/mozc_version_template.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MAJOR=2
22
MINOR=17
3-
BUILD=2145
3+
BUILD=2146
44
REVISION=102
55
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
66
# downloaded by NaCl Mozc.

0 commit comments

Comments
 (0)