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
This commit is contained in:
Pirama Arumuga Nainar 2018-04-11 23:10:28 -07:00
parent af15fbf9aa
commit 90affce0c8
23 changed files with 23 additions and 32 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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
// ---------------------------------------------------------------------------

View file

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

View file

@ -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

View file

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

View file

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

View file

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

View file

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

View file

@ -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
// ---------------------------------------------------------------------------

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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
// ---------------------------------------------------------------------------

View file

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