diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/icu_util.cc | 6 | ||||
| -rw-r--r-- | base/logging.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/base/icu_util.cc b/base/icu_util.cc index dc8302c..4821fef 100644 --- a/base/icu_util.cc +++ b/base/icu_util.cc @@ -34,11 +34,11 @@ #define ICU_UTIL_DATA_IMPL ICU_UTIL_DATA_FILE #endif -#endif // ICU_UTIL_DATA_IMPL +#endif // ICU_UTIL_DATA_IMPL #if defined(OS_WIN) -#define ICU_UTIL_DATA_SYMBOL "icudt38_dat" -#define ICU_UTIL_DATA_SHARED_MODULE_NAME L"icudt38.dll" +#define ICU_UTIL_DATA_SYMBOL "icudt38_dat" +#define ICU_UTIL_DATA_SHARED_MODULE_NAME L"icudt38.dll" #endif namespace icu_util { diff --git a/base/logging.h b/base/logging.h index baedb8b..ee3ab40 100644 --- a/base/logging.h +++ b/base/logging.h @@ -259,7 +259,9 @@ std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) { extern std::string* MakeCheckOpStringIntInt(int v1, int v2, const char* names); template<int, int> -std::string* MakeCheckOpString(const int& v1, const int& v2, const char* names) { +std::string* MakeCheckOpString(const int& v1, + const int& v2, + const char* names) { return MakeCheckOpStringIntInt(v1, v2, names); } |