diff options
author | Christopher Wiley <wiley@google.com> | 2015-12-29 15:16:44 +0000 |
---|---|---|
committer | Christopher Wiley <wiley@google.com> | 2015-12-29 15:16:44 +0000 |
commit | 88ee374b55dcee26c0712f33ed88dde272225ff9 (patch) | |
tree | 0d0d0b6f5a54634cd75a31f2cfa85c1540328522 /base/files | |
parent | b636ff6a8ac3b54b3067289f01848252ab71eceb (diff) | |
download | libchrome-88ee374b55dcee26c0712f33ed88dde272225ff9.tar.gz |
Revert "Fix compiler warnings in libchrome"
This reverts commit b636ff6a8ac3b54b3067289f01848252ab71eceb.
This broke trunk with messages like:
In file included from external/libchrome/base/time/time_posix.cc:29:0:
external/libchrome/base/lazy_instance.h:51:36: error: missing initializer for member 'base::LazyInstance<base::Lock, base::internal::LeakyLazyInstanceTraits<base::Lock> >::private_instance_' [-Werror=missing-field-initializers]
#define LAZY_INSTANCE_INITIALIZER {}
^
external/libchrome/base/time/time_posix.cc:39:38: note: in expansion of macro 'LAZY_INSTANCE_INITIALIZER'
g_sys_time_to_time_struct_lock = LAZY_INSTANCE_INITIALIZER;
^
external/libchrome/base/lazy_instance.h:51:36: error: missing initializer for member 'base::LazyInstance<base::Lock, base::internal::LeakyLazyInstanceTraits<base::Lock> >::private_buf_' [-Werror=missing-field-initializers]
#define LAZY_INSTANCE_INITIALIZER {}
^
external/libchrome/base/time/time_posix.cc:39:38: note: in expansion of macro 'LAZY_INSTANCE_INITIALIZER'
g_sys_time_to_time_struct_lock = LAZY_INSTANCE_INITIALIZER;
^
cc1plus: all warnings being treated as errors
Change-Id: I0c0308e716bd1ed7914e2a032e439a9261d38e56
Diffstat (limited to 'base/files')
-rw-r--r-- | base/files/file_path.cc | 4 | ||||
-rw-r--r-- | base/files/file_util_posix.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/base/files/file_path.cc b/base/files/file_path.cc index b04a01df26..de8927ac5b 100644 --- a/base/files/file_path.cc +++ b/base/files/file_path.cc @@ -45,7 +45,7 @@ const FilePath::CharType kStringTerminator = FILE_PATH_LITERAL('\0'); // otherwise returns npos. This can only be true on Windows, when a pathname // begins with a letter followed by a colon. On other platforms, this always // returns npos. -StringType::size_type FindDriveLetter(const StringType& /* path */) { +StringType::size_type FindDriveLetter(const StringType& path) { #if defined(FILE_PATH_USES_DRIVE_LETTERS) // This is dependent on an ASCII-based character set, but that's a // reasonable assumption. iswalpha can be too inclusive here. @@ -1297,7 +1297,7 @@ FilePath FilePath::NormalizePathSeparators() const { return NormalizePathSeparatorsTo(kSeparators[0]); } -FilePath FilePath::NormalizePathSeparatorsTo(CharType /* separator */) const { +FilePath FilePath::NormalizePathSeparatorsTo(CharType separator) const { #if defined(FILE_PATH_USES_WIN_SEPARATORS) DCHECK_NE(kSeparators + kSeparatorsLength, std::find(kSeparators, kSeparators + kSeparatorsLength, separator)); diff --git a/base/files/file_util_posix.cc b/base/files/file_util_posix.cc index 62ca6a56e3..af0cde4af9 100644 --- a/base/files/file_util_posix.cc +++ b/base/files/file_util_posix.cc @@ -559,7 +559,7 @@ bool CreateTemporaryDirInDir(const FilePath& base_dir, return CreateTemporaryDirInDirImpl(base_dir, mkdtemp_template, new_dir); } -bool CreateNewTempDirectory(const FilePath::StringType& /* prefix */, +bool CreateNewTempDirectory(const FilePath::StringType& prefix, FilePath* new_temp_path) { FilePath tmpdir; if (!GetTempDir(&tmpdir)) |