Merge "Remove more semicolons at the end of namespaces"

libutils/SharedBuffer.h

@@ -139,7 +139,7 @@ bool SharedBuffer::onlyOwner() const {
     return (mRefs.load(std::memory_order_acquire) == 1);
 }
 
-}; // namespace android
+}  // namespace android
 
 // ---------------------------------------------------------------------------
 

libutils/include/utils/AndroidThreads.h

@@ -118,7 +118,7 @@ inline thread_id_t getThreadId() {
 }
 
 // ----------------------------------------------------------------------------
-}; // namespace android
+}  // namespace android
 #endif  // __cplusplus
 // ----------------------------------------------------------------------------
 

libutils/include/utils/CallStack.h

@@ -67,6 +67,6 @@ private:
     Vector<String8> mFrameLines;
 };
 
-}; // namespace android
+}  // namespace android
 
 #endif // ANDROID_CALLSTACK_H

libutils/include/utils/Condition.h

@@ -159,7 +159,7 @@ inline void Condition::broadcast() {
 #endif // !defined(_WIN32)
 
 // ---------------------------------------------------------------------------
-}; // namespace android
+}  // namespace android
 // ---------------------------------------------------------------------------
 
 #endif // _LIBS_UTILS_CONDITON_H

libutils/include/utils/Debug.h

@@ -35,6 +35,6 @@ template<> struct CompileTimeAssert<true> {};
     CompileTimeAssert<( _exp )>();
 
 // ---------------------------------------------------------------------------
-}; // namespace android
+}  // namespace android
 
 #endif // ANDROID_UTILS_DEBUG_H

libutils/include/utils/FileMap.h

@@ -124,6 +124,6 @@ private:
     static long mPageSize;
 };
 
-}; // namespace android
+}  // namespace android
 
 #endif // __LIBS_FILE_MAP_H

libutils/include/utils/Flattenable.h

@@ -198,8 +198,6 @@ public:
     }
 };
 
-
+}  // namespace android
-}; // namespace android
-
 
 #endif /* ANDROID_UTILS_FLATTENABLE_H */

libutils/include/utils/Functor.h

@@ -32,6 +32,6 @@ public:
     virtual status_t operator ()(int /*what*/, void* /*data*/) { return NO_ERROR; }
 };
 
-}; // namespace android
+}  // namespace android
 
 #endif // ANDROID_FUNCTOR_H

libutils/include/utils/KeyedVector.h

@@ -211,7 +211,7 @@ const VALUE& DefaultKeyedVector<KEY,VALUE>::valueFor(const KEY& key) const {
     return i >= 0 ? KeyedVector<KEY,VALUE>::valueAt(i) : mDefault;
 }
 
-}; // namespace android
+}  // namespace android
 
 // ---------------------------------------------------------------------------
 

libutils/include/utils/List.h

@@ -329,6 +329,6 @@ List<T>& List<T>::operator=(const List<T>& right)
     return *this;
 }
 
-}; // namespace android
+}  // namespace android
 
 #endif // _LIBS_UTILS_LIST_H

libutils/include/utils/Mutex.h

@@ -212,7 +212,7 @@ inline status_t Mutex::timedLock(nsecs_t timeoutNs) {
 typedef Mutex::Autolock AutoMutex;
 
 // ---------------------------------------------------------------------------
-}; // namespace android
+}  // namespace android
 // ---------------------------------------------------------------------------
 
 #endif // _LIBS_UTILS_MUTEX_H

libutils/include/utils/Printer.h

@@ -114,6 +114,6 @@ private:
     const char* mPrefix;
 };
 
-}; // namespace android
+}  // namespace android
 
 #endif // ANDROID_PRINTER_H

libutils/include/utils/ProcessCallStack.h

@@ -74,6 +74,6 @@ private:
     struct tm mTimeUpdated;
 };
 
-}; // namespace android
+}  // namespace android
 
 #endif // ANDROID_PROCESS_CALLSTACK_H

libutils/include/utils/RWLock.h

@@ -120,7 +120,7 @@ inline void RWLock::unlock() {
 #endif // !defined(_WIN32)
 
 // ---------------------------------------------------------------------------
-}; // namespace android
+}  // namespace android
 // ---------------------------------------------------------------------------
 
 #endif // _LIBS_UTILS_RWLOCK_H

libutils/include/utils/Singleton.h

@@ -95,7 +95,7 @@ private:
 
 
 // ---------------------------------------------------------------------------
-}; // namespace android
+}  // namespace android
 
 #endif // ANDROID_UTILS_SINGLETON_H
 

libutils/include/utils/SortedVector.h

@@ -288,8 +288,7 @@ int SortedVector<TYPE>::do_compare(const void* lhs, const void* rhs) const {
     return compare_type( *reinterpret_cast<const TYPE*>(lhs), *reinterpret_cast<const TYPE*>(rhs) );
 }
 
-}; // namespace android
+}  // namespace android
-
 
 // ---------------------------------------------------------------------------
 

libutils/include/utils/StopWatch.h

@@ -52,9 +52,7 @@ private:
     int             mNumLaps;
 };
 
-
+}  // namespace android
-}; // namespace android
-
 
 // ---------------------------------------------------------------------------
 

libutils/include/utils/SystemClock.h

@@ -26,7 +26,7 @@ int64_t uptimeMillis();
 int64_t elapsedRealtime();
 int64_t elapsedRealtimeNano();
 
-}; // namespace android
+}  // namespace android
 
 #endif // ANDROID_UTILS_SYSTEMCLOCK_H
 

libutils/include/utils/Thread.h

@@ -110,8 +110,7 @@ private:
 #endif
 };
 
-
+}  // namespace android
-}; // namespace android
 
 // ---------------------------------------------------------------------------
 #endif // _LIBS_UTILS_THREAD_H

libutils/include/utils/ThreadDefs.h

@@ -66,9 +66,8 @@ enum {
 };
 
 // ---------------------------------------------------------------------------
-}; // namespace android
+}  // namespace android
 #endif  // __cplusplus
 // ---------------------------------------------------------------------------
 
-
 #endif // _LIBS_UTILS_THREAD_DEFS_H

libutils/include/utils/Trace.h

@@ -49,7 +49,7 @@ private:
     uint64_t mTag;
 };
 
-}; // namespace android
+}  // namespace android
 
 #else // !__ANDROID__
 

libutils/include/utils/Vector.h

@@ -425,8 +425,7 @@ UTILS_VECTOR_NO_CFI void Vector<TYPE>::do_move_backward(void* dest, const void*
     move_backward_type( reinterpret_cast<TYPE*>(dest), reinterpret_cast<const TYPE*>(from), num );
 }
 
-}; // namespace android
+}  // namespace android
-
 
 // ---------------------------------------------------------------------------
 

libutils/include/utils/VectorImpl.h

@@ -175,8 +175,7 @@ private:
             ssize_t         replaceAt(const void* item, size_t index);
 };
 
-}; // namespace android
+}  // namespace android
-
 
 // ---------------------------------------------------------------------------