diff options
author | Pirama Arumuga Nainar | 2018-04-12 01:10:28 -0500 |
---|---|---|
committer | Pirama Arumuga Nainar | 2018-04-12 01:14:13 -0500 |
commit | 90affce0c872afea64ed1c1a7f00a715abf5b89d (patch) | |
tree | ad64d81ca32f24cf594c87c772ace32cebd818db /libutils | |
parent | af15fbf9aa6bb991a6abe8b2b72acc1a9405eff9 (diff) | |
download | platform-system-core-90affce0c872afea64ed1c1a7f00a715abf5b89d.tar.gz platform-system-core-90affce0c872afea64ed1c1a7f00a715abf5b89d.tar.xz platform-system-core-90affce0c872afea64ed1c1a7f00a715abf5b89d.zip |
Remove more semicolons at the end of namespaces
These warnings are triggered by -Wextra-semi (and not -Weverything, as
incorrectly mentioned in I49b6e6af483e011632e6a34c0663c93e5c385aa6).
This warning is added to Hidl-generated libs.
To appease clang-format, this patch also fixes some extra newlines.
Test: Build
Change-Id: I63cf5d8ecba46ad87876ff21848bfff04b12ec6e
Diffstat (limited to 'libutils')
23 files changed, 23 insertions, 32 deletions
diff --git a/libutils/SharedBuffer.h b/libutils/SharedBuffer.h index 48358cddc..81cadffa2 100644 --- a/libutils/SharedBuffer.h +++ b/libutils/SharedBuffer.h | |||
@@ -139,7 +139,7 @@ bool SharedBuffer::onlyOwner() const { | |||
139 | return (mRefs.load(std::memory_order_acquire) == 1); | 139 | return (mRefs.load(std::memory_order_acquire) == 1); |
140 | } | 140 | } |
141 | 141 | ||
142 | }; // namespace android | 142 | } // namespace android |
143 | 143 | ||
144 | // --------------------------------------------------------------------------- | 144 | // --------------------------------------------------------------------------- |
145 | 145 | ||
diff --git a/libutils/include/utils/AndroidThreads.h b/libutils/include/utils/AndroidThreads.h index 4c2dd49f6..dab888d5a 100644 --- a/libutils/include/utils/AndroidThreads.h +++ b/libutils/include/utils/AndroidThreads.h | |||
@@ -118,7 +118,7 @@ inline thread_id_t getThreadId() { | |||
118 | } | 118 | } |
119 | 119 | ||
120 | // ---------------------------------------------------------------------------- | 120 | // ---------------------------------------------------------------------------- |
121 | }; // namespace android | 121 | } // namespace android |
122 | #endif // __cplusplus | 122 | #endif // __cplusplus |
123 | // ---------------------------------------------------------------------------- | 123 | // ---------------------------------------------------------------------------- |
124 | 124 | ||
diff --git a/libutils/include/utils/CallStack.h b/libutils/include/utils/CallStack.h index 27e89f462..96221425e 100644 --- a/libutils/include/utils/CallStack.h +++ b/libutils/include/utils/CallStack.h | |||
@@ -67,6 +67,6 @@ private: | |||
67 | Vector<String8> mFrameLines; | 67 | Vector<String8> mFrameLines; |
68 | }; | 68 | }; |
69 | 69 | ||
70 | }; // namespace android | 70 | } // namespace android |
71 | 71 | ||
72 | #endif // ANDROID_CALLSTACK_H | 72 | #endif // ANDROID_CALLSTACK_H |
diff --git a/libutils/include/utils/Condition.h b/libutils/include/utils/Condition.h index 9bf82eb77..c8da67c27 100644 --- a/libutils/include/utils/Condition.h +++ b/libutils/include/utils/Condition.h | |||
@@ -159,7 +159,7 @@ inline void Condition::broadcast() { | |||
159 | #endif // !defined(_WIN32) | 159 | #endif // !defined(_WIN32) |
160 | 160 | ||
161 | // --------------------------------------------------------------------------- | 161 | // --------------------------------------------------------------------------- |
162 | }; // namespace android | 162 | } // namespace android |
163 | // --------------------------------------------------------------------------- | 163 | // --------------------------------------------------------------------------- |
164 | 164 | ||
165 | #endif // _LIBS_UTILS_CONDITON_H | 165 | #endif // _LIBS_UTILS_CONDITON_H |
diff --git a/libutils/include/utils/Debug.h b/libutils/include/utils/Debug.h index 4cbb46200..96bd70eb0 100644 --- a/libutils/include/utils/Debug.h +++ b/libutils/include/utils/Debug.h | |||
@@ -35,6 +35,6 @@ template<> struct CompileTimeAssert<true> {}; | |||
35 | CompileTimeAssert<( _exp )>(); | 35 | CompileTimeAssert<( _exp )>(); |
36 | 36 | ||
37 | // --------------------------------------------------------------------------- | 37 | // --------------------------------------------------------------------------- |
38 | }; // namespace android | 38 | } // namespace android |
39 | 39 | ||
40 | #endif // ANDROID_UTILS_DEBUG_H | 40 | #endif // ANDROID_UTILS_DEBUG_H |
diff --git a/libutils/include/utils/FileMap.h b/libutils/include/utils/FileMap.h index 7d372e1dc..8d402a3c2 100644 --- a/libutils/include/utils/FileMap.h +++ b/libutils/include/utils/FileMap.h | |||
@@ -124,6 +124,6 @@ private: | |||
124 | static long mPageSize; | 124 | static long mPageSize; |
125 | }; | 125 | }; |
126 | 126 | ||
127 | }; // namespace android | 127 | } // namespace android |
128 | 128 | ||
129 | #endif // __LIBS_FILE_MAP_H | 129 | #endif // __LIBS_FILE_MAP_H |
diff --git a/libutils/include/utils/Flattenable.h b/libutils/include/utils/Flattenable.h index 675e211e0..0a19019ac 100644 --- a/libutils/include/utils/Flattenable.h +++ b/libutils/include/utils/Flattenable.h | |||
@@ -198,8 +198,6 @@ public: | |||
198 | } | 198 | } |
199 | }; | 199 | }; |
200 | 200 | ||
201 | 201 | } // namespace android | |
202 | }; // namespace android | ||
203 | |||
204 | 202 | ||
205 | #endif /* ANDROID_UTILS_FLATTENABLE_H */ | 203 | #endif /* ANDROID_UTILS_FLATTENABLE_H */ |
diff --git a/libutils/include/utils/Functor.h b/libutils/include/utils/Functor.h index 3182a9c61..c0c8d5713 100644 --- a/libutils/include/utils/Functor.h +++ b/libutils/include/utils/Functor.h | |||
@@ -32,6 +32,6 @@ public: | |||
32 | virtual status_t operator ()(int /*what*/, void* /*data*/) { return NO_ERROR; } | 32 | virtual status_t operator ()(int /*what*/, void* /*data*/) { return NO_ERROR; } |
33 | }; | 33 | }; |
34 | 34 | ||
35 | }; // namespace android | 35 | } // namespace android |
36 | 36 | ||
37 | #endif // ANDROID_FUNCTOR_H | 37 | #endif // ANDROID_FUNCTOR_H |
diff --git a/libutils/include/utils/KeyedVector.h b/libutils/include/utils/KeyedVector.h index 03bfe2701..7bda99beb 100644 --- a/libutils/include/utils/KeyedVector.h +++ b/libutils/include/utils/KeyedVector.h | |||
@@ -211,7 +211,7 @@ const VALUE& DefaultKeyedVector<KEY,VALUE>::valueFor(const KEY& key) const { | |||
211 | return i >= 0 ? KeyedVector<KEY,VALUE>::valueAt(i) : mDefault; | 211 | return i >= 0 ? KeyedVector<KEY,VALUE>::valueAt(i) : mDefault; |
212 | } | 212 | } |
213 | 213 | ||
214 | }; // namespace android | 214 | } // namespace android |
215 | 215 | ||
216 | // --------------------------------------------------------------------------- | 216 | // --------------------------------------------------------------------------- |
217 | 217 | ||
diff --git a/libutils/include/utils/List.h b/libutils/include/utils/List.h index daca016d4..25b56fd21 100644 --- a/libutils/include/utils/List.h +++ b/libutils/include/utils/List.h | |||
@@ -329,6 +329,6 @@ List<T>& List<T>::operator=(const List<T>& right) | |||
329 | return *this; | 329 | return *this; |
330 | } | 330 | } |
331 | 331 | ||
332 | }; // namespace android | 332 | } // namespace android |
333 | 333 | ||
334 | #endif // _LIBS_UTILS_LIST_H | 334 | #endif // _LIBS_UTILS_LIST_H |
diff --git a/libutils/include/utils/Mutex.h b/libutils/include/utils/Mutex.h index af6076cf3..1228df4cd 100644 --- a/libutils/include/utils/Mutex.h +++ b/libutils/include/utils/Mutex.h | |||
@@ -212,7 +212,7 @@ inline status_t Mutex::timedLock(nsecs_t timeoutNs) { | |||
212 | typedef Mutex::Autolock AutoMutex; | 212 | typedef Mutex::Autolock AutoMutex; |
213 | 213 | ||
214 | // --------------------------------------------------------------------------- | 214 | // --------------------------------------------------------------------------- |
215 | }; // namespace android | 215 | } // namespace android |
216 | // --------------------------------------------------------------------------- | 216 | // --------------------------------------------------------------------------- |
217 | 217 | ||
218 | #endif // _LIBS_UTILS_MUTEX_H | 218 | #endif // _LIBS_UTILS_MUTEX_H |
diff --git a/libutils/include/utils/Printer.h b/libutils/include/utils/Printer.h index bb6628767..a6f69280e 100644 --- a/libutils/include/utils/Printer.h +++ b/libutils/include/utils/Printer.h | |||
@@ -114,6 +114,6 @@ private: | |||
114 | const char* mPrefix; | 114 | const char* mPrefix; |
115 | }; | 115 | }; |
116 | 116 | ||
117 | }; // namespace android | 117 | } // namespace android |
118 | 118 | ||
119 | #endif // ANDROID_PRINTER_H | 119 | #endif // ANDROID_PRINTER_H |
diff --git a/libutils/include/utils/ProcessCallStack.h b/libutils/include/utils/ProcessCallStack.h index 32458b8b1..b5f2edc4c 100644 --- a/libutils/include/utils/ProcessCallStack.h +++ b/libutils/include/utils/ProcessCallStack.h | |||
@@ -74,6 +74,6 @@ private: | |||
74 | struct tm mTimeUpdated; | 74 | struct tm mTimeUpdated; |
75 | }; | 75 | }; |
76 | 76 | ||
77 | }; // namespace android | 77 | } // namespace android |
78 | 78 | ||
79 | #endif // ANDROID_PROCESS_CALLSTACK_H | 79 | #endif // ANDROID_PROCESS_CALLSTACK_H |
diff --git a/libutils/include/utils/RWLock.h b/libutils/include/utils/RWLock.h index d5b81d3a8..7d43e69f1 100644 --- a/libutils/include/utils/RWLock.h +++ b/libutils/include/utils/RWLock.h | |||
@@ -120,7 +120,7 @@ inline void RWLock::unlock() { | |||
120 | #endif // !defined(_WIN32) | 120 | #endif // !defined(_WIN32) |
121 | 121 | ||
122 | // --------------------------------------------------------------------------- | 122 | // --------------------------------------------------------------------------- |
123 | }; // namespace android | 123 | } // namespace android |
124 | // --------------------------------------------------------------------------- | 124 | // --------------------------------------------------------------------------- |
125 | 125 | ||
126 | #endif // _LIBS_UTILS_RWLOCK_H | 126 | #endif // _LIBS_UTILS_RWLOCK_H |
diff --git a/libutils/include/utils/Singleton.h b/libutils/include/utils/Singleton.h index bc47a5cac..2dd5a47e6 100644 --- a/libutils/include/utils/Singleton.h +++ b/libutils/include/utils/Singleton.h | |||
@@ -95,7 +95,7 @@ private: | |||
95 | 95 | ||
96 | 96 | ||
97 | // --------------------------------------------------------------------------- | 97 | // --------------------------------------------------------------------------- |
98 | }; // namespace android | 98 | } // namespace android |
99 | 99 | ||
100 | #endif // ANDROID_UTILS_SINGLETON_H | 100 | #endif // ANDROID_UTILS_SINGLETON_H |
101 | 101 | ||
diff --git a/libutils/include/utils/SortedVector.h b/libutils/include/utils/SortedVector.h index 47c1376ce..394db1215 100644 --- a/libutils/include/utils/SortedVector.h +++ b/libutils/include/utils/SortedVector.h | |||
@@ -288,8 +288,7 @@ int SortedVector<TYPE>::do_compare(const void* lhs, const void* rhs) const { | |||
288 | return compare_type( *reinterpret_cast<const TYPE*>(lhs), *reinterpret_cast<const TYPE*>(rhs) ); | 288 | return compare_type( *reinterpret_cast<const TYPE*>(lhs), *reinterpret_cast<const TYPE*>(rhs) ); |
289 | } | 289 | } |
290 | 290 | ||
291 | }; // namespace android | 291 | } // namespace android |
292 | |||
293 | 292 | ||
294 | // --------------------------------------------------------------------------- | 293 | // --------------------------------------------------------------------------- |
295 | 294 | ||
diff --git a/libutils/include/utils/StopWatch.h b/libutils/include/utils/StopWatch.h index 76d78d0f4..9b14ac809 100644 --- a/libutils/include/utils/StopWatch.h +++ b/libutils/include/utils/StopWatch.h | |||
@@ -52,9 +52,7 @@ private: | |||
52 | int mNumLaps; | 52 | int mNumLaps; |
53 | }; | 53 | }; |
54 | 54 | ||
55 | 55 | } // namespace android | |
56 | }; // namespace android | ||
57 | |||
58 | 56 | ||
59 | // --------------------------------------------------------------------------- | 57 | // --------------------------------------------------------------------------- |
60 | 58 | ||
diff --git a/libutils/include/utils/SystemClock.h b/libutils/include/utils/SystemClock.h index 01db34078..f816fbaf7 100644 --- a/libutils/include/utils/SystemClock.h +++ b/libutils/include/utils/SystemClock.h | |||
@@ -26,7 +26,7 @@ int64_t uptimeMillis(); | |||
26 | int64_t elapsedRealtime(); | 26 | int64_t elapsedRealtime(); |
27 | int64_t elapsedRealtimeNano(); | 27 | int64_t elapsedRealtimeNano(); |
28 | 28 | ||
29 | }; // namespace android | 29 | } // namespace android |
30 | 30 | ||
31 | #endif // ANDROID_UTILS_SYSTEMCLOCK_H | 31 | #endif // ANDROID_UTILS_SYSTEMCLOCK_H |
32 | 32 | ||
diff --git a/libutils/include/utils/Thread.h b/libutils/include/utils/Thread.h index 598298de5..352513898 100644 --- a/libutils/include/utils/Thread.h +++ b/libutils/include/utils/Thread.h | |||
@@ -110,8 +110,7 @@ private: | |||
110 | #endif | 110 | #endif |
111 | }; | 111 | }; |
112 | 112 | ||
113 | 113 | } // namespace android | |
114 | }; // namespace android | ||
115 | 114 | ||
116 | // --------------------------------------------------------------------------- | 115 | // --------------------------------------------------------------------------- |
117 | #endif // _LIBS_UTILS_THREAD_H | 116 | #endif // _LIBS_UTILS_THREAD_H |
diff --git a/libutils/include/utils/ThreadDefs.h b/libutils/include/utils/ThreadDefs.h index ae091e40f..8eb3d1cbe 100644 --- a/libutils/include/utils/ThreadDefs.h +++ b/libutils/include/utils/ThreadDefs.h | |||
@@ -66,9 +66,8 @@ enum { | |||
66 | }; | 66 | }; |
67 | 67 | ||
68 | // --------------------------------------------------------------------------- | 68 | // --------------------------------------------------------------------------- |
69 | }; // namespace android | 69 | } // namespace android |
70 | #endif // __cplusplus | 70 | #endif // __cplusplus |
71 | // --------------------------------------------------------------------------- | 71 | // --------------------------------------------------------------------------- |
72 | 72 | ||
73 | |||
74 | #endif // _LIBS_UTILS_THREAD_DEFS_H | 73 | #endif // _LIBS_UTILS_THREAD_DEFS_H |
diff --git a/libutils/include/utils/Trace.h b/libutils/include/utils/Trace.h index 5e9229c1e..4b9c91ec5 100644 --- a/libutils/include/utils/Trace.h +++ b/libutils/include/utils/Trace.h | |||
@@ -49,7 +49,7 @@ private: | |||
49 | uint64_t mTag; | 49 | uint64_t mTag; |
50 | }; | 50 | }; |
51 | 51 | ||
52 | }; // namespace android | 52 | } // namespace android |
53 | 53 | ||
54 | #else // !__ANDROID__ | 54 | #else // !__ANDROID__ |
55 | 55 | ||
diff --git a/libutils/include/utils/Vector.h b/libutils/include/utils/Vector.h index a1a0234e3..ddf71de24 100644 --- a/libutils/include/utils/Vector.h +++ b/libutils/include/utils/Vector.h | |||
@@ -425,8 +425,7 @@ UTILS_VECTOR_NO_CFI void Vector<TYPE>::do_move_backward(void* dest, const void* | |||
425 | move_backward_type( reinterpret_cast<TYPE*>(dest), reinterpret_cast<const TYPE*>(from), num ); | 425 | move_backward_type( reinterpret_cast<TYPE*>(dest), reinterpret_cast<const TYPE*>(from), num ); |
426 | } | 426 | } |
427 | 427 | ||
428 | }; // namespace android | 428 | } // namespace android |
429 | |||
430 | 429 | ||
431 | // --------------------------------------------------------------------------- | 430 | // --------------------------------------------------------------------------- |
432 | 431 | ||
diff --git a/libutils/include/utils/VectorImpl.h b/libutils/include/utils/VectorImpl.h index 4dd91fd29..55d5d9818 100644 --- a/libutils/include/utils/VectorImpl.h +++ b/libutils/include/utils/VectorImpl.h | |||
@@ -175,8 +175,7 @@ private: | |||
175 | ssize_t replaceAt(const void* item, size_t index); | 175 | ssize_t replaceAt(const void* item, size_t index); |
176 | }; | 176 | }; |
177 | 177 | ||
178 | }; // namespace android | 178 | } // namespace android |
179 | |||
180 | 179 | ||
181 | // --------------------------------------------------------------------------- | 180 | // --------------------------------------------------------------------------- |
182 | 181 | ||