diff options
author | danakj <danakj@chromium.org> | 2015-03-06 17:51:42 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-07 01:52:44 +0000 |
commit | c3762b9e20b93c8f94f44224b5023789173965e2 (patch) | |
tree | 9c51e37a2e46f38cfd1000c8519273794b4cf2b4 /base | |
parent | c7f5ee53e3b82696a75bfbde7474af9a696aa9c3 (diff) | |
download | chromium_src-c3762b9e20b93c8f94f44224b5023789173965e2.zip chromium_src-c3762b9e20b93c8f94f44224b5023789173965e2.tar.gz chromium_src-c3762b9e20b93c8f94f44224b5023789173965e2.tar.bz2 |
base: Add/Fix namespace closing comments.
A namespace foo should end with a comment "// namespace foo", this
corrects errors in base/.
BUG=464816
Review URL: https://codereview.chromium.org/981803003
Cr-Commit-Position: refs/heads/master@{#319543}
Diffstat (limited to 'base')
31 files changed, 37 insertions, 36 deletions
diff --git a/base/android/jni_string.cc b/base/android/jni_string.cc index d25fed8..57c2805 100644 --- a/base/android/jni_string.cc +++ b/base/android/jni_string.cc @@ -18,7 +18,7 @@ jstring ConvertUTF16ToJavaStringImpl(JNIEnv* env, return result; } -} +} // namespace namespace base { namespace android { diff --git a/base/atomicops_internals_arm64_gcc.h b/base/atomicops_internals_arm64_gcc.h index bb6a346..ddcfec9 100644 --- a/base/atomicops_internals_arm64_gcc.h +++ b/base/atomicops_internals_arm64_gcc.h @@ -301,7 +301,7 @@ inline Atomic64 Release_Load(volatile const Atomic64* ptr) { return *ptr; } -} // namespace base::subtle +} // namespace subtle } // namespace base #endif // BASE_ATOMICOPS_INTERNALS_ARM64_GCC_H_ diff --git a/base/atomicops_internals_arm_gcc.h b/base/atomicops_internals_arm_gcc.h index e654afa..44c91c8 100644 --- a/base/atomicops_internals_arm_gcc.h +++ b/base/atomicops_internals_arm_gcc.h @@ -288,7 +288,7 @@ inline Atomic32 Release_Load(volatile const Atomic32* ptr) { return *ptr; } -} // namespace base::subtle +} // namespace subtle } // namespace base #endif // BASE_ATOMICOPS_INTERNALS_ARM_GCC_H_ diff --git a/base/atomicops_internals_atomicword_compat.h b/base/atomicops_internals_atomicword_compat.h index e02d11d..342a6e4 100644 --- a/base/atomicops_internals_atomicword_compat.h +++ b/base/atomicops_internals_atomicword_compat.h @@ -92,8 +92,8 @@ inline AtomicWord Release_Load(volatile const AtomicWord* ptr) { reinterpret_cast<volatile const Atomic32*>(ptr)); } -} // namespace base::subtle -} // namespace base +} // namespace subtle +} // namespace base #endif // !defined(ARCH_CPU_64_BITS) diff --git a/base/atomicops_internals_gcc.h b/base/atomicops_internals_gcc.h index ed1b2d7..35c95fe 100644 --- a/base/atomicops_internals_gcc.h +++ b/base/atomicops_internals_gcc.h @@ -99,7 +99,7 @@ inline Atomic32 Release_Load(volatile const Atomic32* ptr) { return *ptr; } -} // namespace base::subtle +} // namespace subtle } // namespace base #endif // BASE_ATOMICOPS_INTERNALS_GCC_H_ diff --git a/base/atomicops_internals_mac.h b/base/atomicops_internals_mac.h index ccbb896..98864a7 100644 --- a/base/atomicops_internals_mac.h +++ b/base/atomicops_internals_mac.h @@ -191,7 +191,7 @@ inline Atomic64 Release_Load(volatile const Atomic64* ptr) { #endif // defined(__LP64__) -} // namespace base::subtle -} // namespace base +} // namespace subtle +} // namespace base #endif // BASE_ATOMICOPS_INTERNALS_MAC_H_ diff --git a/base/atomicops_internals_mips_gcc.h b/base/atomicops_internals_mips_gcc.h index e206e03..b4551b8 100644 --- a/base/atomicops_internals_mips_gcc.h +++ b/base/atomicops_internals_mips_gcc.h @@ -274,7 +274,7 @@ inline Atomic64 Release_Load(volatile const Atomic64* ptr) { } #endif -} // namespace base::subtle -} // namespace base +} // namespace subtle +} // namespace base #endif // BASE_ATOMICOPS_INTERNALS_MIPS_GCC_H_ diff --git a/base/atomicops_internals_portable.h b/base/atomicops_internals_portable.h index b25099f..d285610 100644 --- a/base/atomicops_internals_portable.h +++ b/base/atomicops_internals_portable.h @@ -221,7 +221,7 @@ inline Atomic64 Release_Load(volatile const Atomic64* ptr) { } #endif // defined(ARCH_CPU_64_BITS) -} -} // namespace base::subtle +} // namespace subtle +} // namespace base #endif // BASE_ATOMICOPS_INTERNALS_PORTABLE_H_ diff --git a/base/atomicops_internals_x86_gcc.h b/base/atomicops_internals_x86_gcc.h index 69eacdb..f0d2242 100644 --- a/base/atomicops_internals_x86_gcc.h +++ b/base/atomicops_internals_x86_gcc.h @@ -220,8 +220,8 @@ inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr, #endif // defined(__x86_64__) -} // namespace base::subtle -} // namespace base +} // namespace subtle +} // namespace base #undef ATOMICOPS_COMPILER_BARRIER diff --git a/base/atomicops_internals_x86_msvc.h b/base/atomicops_internals_x86_msvc.h index 26f1813..71ddca2 100644 --- a/base/atomicops_internals_x86_msvc.h +++ b/base/atomicops_internals_x86_msvc.h @@ -189,7 +189,7 @@ inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr, #endif // defined(_WIN64) -} // namespace base::subtle +} // namespace subtle } // namespace base #endif // BASE_ATOMICOPS_INTERNALS_X86_MSVC_H_ diff --git a/base/auto_reset.h b/base/auto_reset.h index 32f138e..a5bcfaa 100644 --- a/base/auto_reset.h +++ b/base/auto_reset.h @@ -36,6 +36,6 @@ class AutoReset { DISALLOW_COPY_AND_ASSIGN(AutoReset); }; -} +} // namespace base #endif // BASE_AUTO_RESET_H_ diff --git a/base/containers/hash_tables.h b/base/containers/hash_tables.h index 6bf029e..d13c469 100644 --- a/base/containers/hash_tables.h +++ b/base/containers/hash_tables.h @@ -320,7 +320,7 @@ struct hash<std::pair<Type1, Type2> > { } }; -} +} // namespace BASE_HASH_NAMESPACE #undef DEFINE_PAIR_HASH_FUNCTION_START #undef DEFINE_PAIR_HASH_FUNCTION_END diff --git a/base/guid_posix.cc b/base/guid_posix.cc index 9681b08..f0fedc2 100644 --- a/base/guid_posix.cc +++ b/base/guid_posix.cc @@ -39,4 +39,4 @@ std::string RandomDataToGUIDString(const uint64 bytes[2]) { bytes[1] & 0x0000ffffffffffffULL); } -} // namespace guid +} // namespace base diff --git a/base/guid_win.cc b/base/guid_win.cc index cdb860a..da3453d 100644 --- a/base/guid_win.cc +++ b/base/guid_win.cc @@ -35,4 +35,4 @@ std::string GenerateGUID() { return WideToUTF8(guid_string.substr(1, guid_string.length() - 2)); } -} // namespace guid +} // namespace base diff --git a/base/path_service.cc b/base/path_service.cc index ce4966e..3c437ee 100644 --- a/base/path_service.cc +++ b/base/path_service.cc @@ -33,7 +33,7 @@ namespace base { // Mac and Android. bool PathProviderPosix(int key, FilePath* result); #endif -} +} // namespace base namespace { diff --git a/base/path_service.h b/base/path_service.h index 554eb9e..025550f 100644 --- a/base/path_service.h +++ b/base/path_service.h @@ -15,7 +15,7 @@ namespace base { class FilePath; class ScopedPathOverride; -} // namespace +} // namespace base // The path service is a global table mapping keys to file system paths. It is // OK to use this service from multiple threads. diff --git a/base/process/memory.cc b/base/process/memory.cc index 1dbc363..8542dc5 100644 --- a/base/process/memory.cc +++ b/base/process/memory.cc @@ -27,4 +27,4 @@ bool UncheckedCalloc(size_t num_items, size_t size, void** result) { #endif -} +} // namespace base diff --git a/base/process/process_posix.cc b/base/process/process_posix.cc index a36bf77..39ae791 100644 --- a/base/process/process_posix.cc +++ b/base/process/process_posix.cc @@ -324,4 +324,4 @@ int Process::GetPriority() const { return getpriority(PRIO_PROCESS, process_); } -} // namspace base +} // namespace base diff --git a/base/stl_util_unittest.cc b/base/stl_util_unittest.cc index 06ea7cd..42004eb 100644 --- a/base/stl_util_unittest.cc +++ b/base/stl_util_unittest.cc @@ -28,7 +28,7 @@ class ComparableValue { int value_; }; -} +} // namespace namespace base { namespace { diff --git a/base/strings/nullable_string16.h b/base/strings/nullable_string16.h index 5997d17..016c25c 100644 --- a/base/strings/nullable_string16.h +++ b/base/strings/nullable_string16.h @@ -41,6 +41,6 @@ inline bool operator!=(const NullableString16& a, const NullableString16& b) { BASE_EXPORT std::ostream& operator<<(std::ostream& out, const NullableString16& value); -} // namespace +} // namespace base #endif // BASE_STRINGS_NULLABLE_STRING16_H_ diff --git a/base/strings/utf_offset_string_conversions_unittest.cc b/base/strings/utf_offset_string_conversions_unittest.cc index 529939f..9398a56 100644 --- a/base/strings/utf_offset_string_conversions_unittest.cc +++ b/base/strings/utf_offset_string_conversions_unittest.cc @@ -293,4 +293,4 @@ TEST(UTFOffsetStringConversionsTest, MergeSequentialAdjustments) { EXPECT_EQ(2u, adjustments_on_adjusted_string[5].output_length); } -} // namaspace base +} // namespace base diff --git a/base/strings/utf_string_conversions_unittest.cc b/base/strings/utf_string_conversions_unittest.cc index 009af7c..a7b12ff 100644 --- a/base/strings/utf_string_conversions_unittest.cc +++ b/base/strings/utf_string_conversions_unittest.cc @@ -208,4 +208,4 @@ TEST(UTFStringConversionsTest, ConvertMultiString) { EXPECT_EQ(expected, converted); } -} // base +} // namespace base diff --git a/base/test/null_task_runner.cc b/base/test/null_task_runner.cc index bf43e6d..ffa6bdf 100644 --- a/base/test/null_task_runner.cc +++ b/base/test/null_task_runner.cc @@ -28,4 +28,4 @@ bool NullTaskRunner::RunsTasksOnCurrentThread() const { return true; } -} // namespace +} // namespace base diff --git a/base/test/null_task_runner.h b/base/test/null_task_runner.h index 2cde880..a6471f5 100644 --- a/base/test/null_task_runner.h +++ b/base/test/null_task_runner.h @@ -30,4 +30,4 @@ class NullTaskRunner : public base::SingleThreadTaskRunner { DISALLOW_COPY_AND_ASSIGN(NullTaskRunner); }; -} // namespace +} // namespace base diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h index 1e5f510..75d8925 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h @@ -43,7 +43,7 @@ class NestedMessagePumpAndroid; class RenderWidgetResizeHelper; class ScopedAllowWaitForAndroidLayoutTests; class TextInputClientMac; -} +} // namespace content namespace dbus { class Bus; } diff --git a/base/trace_event/memory_dump_manager.cc b/base/trace_event/memory_dump_manager.cc index cbed238..8b2d930 100644 --- a/base/trace_event/memory_dump_manager.cc +++ b/base/trace_event/memory_dump_manager.cc @@ -37,7 +37,8 @@ const char* DumpPointTypeToString(const DumpPointType& dump_point_type) { NOTREACHED(); return "UNKNOWN"; } -} + +} // namespace // TODO(primiano): this should be smarter and should do something similar to // trace event synthetic delays. diff --git a/base/trace_event/memory_dump_manager_unittest.cc b/base/trace_event/memory_dump_manager_unittest.cc index 78be377..251a92a 100644 --- a/base/trace_event/memory_dump_manager_unittest.cc +++ b/base/trace_event/memory_dump_manager_unittest.cc @@ -148,5 +148,5 @@ TEST_F(MemoryDumpManagerTest, DisableFailingDumpers) { DisableTracing(); } -} // namespace trace_Event +} // namespace trace_event } // namespace base diff --git a/base/trace_event/process_memory_totals_dump_provider_unittest.cc b/base/trace_event/process_memory_totals_dump_provider_unittest.cc index 4a60036..c37e612 100644 --- a/base/trace_event/process_memory_totals_dump_provider_unittest.cc +++ b/base/trace_event/process_memory_totals_dump_provider_unittest.cc @@ -39,5 +39,5 @@ TEST(ProcessMemoryTotalsDumpProviderTest, DumpRSS) { EXPECT_EQ(rss_after - rss_before, kAllocSize); } -} // namespace trace_Event +} // namespace trace_event } // namespace base diff --git a/base/value_conversions.h b/base/value_conversions.h index fde9a26..452c587 100644 --- a/base/value_conversions.h +++ b/base/value_conversions.h @@ -24,6 +24,6 @@ BASE_EXPORT bool GetValueAsFilePath(const Value& value, FilePath* file_path); BASE_EXPORT StringValue* CreateTimeDeltaValue(const TimeDelta& time); BASE_EXPORT bool GetValueAsTimeDelta(const Value& value, TimeDelta* time); -} // namespace +} // namespace base #endif // BASE_VALUE_CONVERSIONS_H_ diff --git a/base/vlog.cc b/base/vlog.cc index 434a70e..8612071 100644 --- a/base/vlog.cc +++ b/base/vlog.cc @@ -178,4 +178,4 @@ bool MatchVlogPattern(const base::StringPiece& string, return false; } -} // namespace +} // namespace logging diff --git a/base/win/scoped_variant.h b/base/win/scoped_variant.h index b6e6579..6a28c68 100644 --- a/base/win/scoped_variant.h +++ b/base/win/scoped_variant.h @@ -161,6 +161,6 @@ class BASE_EXPORT ScopedVariant { }; } // namespace win -} // namesoace base +} // namespace base #endif // BASE_WIN_SCOPED_VARIANT_H_ |