Fix compiler warnings.
system/libhidl/include/hidl/HidlSupport.h:453:93: error: extra ';' after member function definition [-Werror,-Wextra-semi]
constexpr hidl_version(uint16_t major, uint16_t minor) : mMajor(major), mMinor(minor) {};
^
system/libhidl/include/hidl/HidlSupport.h:463:35: error: use of old-style cast [-Werror,-Wold-style-cast]
return parcel.writeUint32((uint32_t) mMajor << 16 | mMinor);
^ ~~~~~~
system/libhidl/include/hidl/IServiceManager.h:58:52: error: extra ';' inside a struct [-Werror,-Wextra-semi]
DECLARE_HWBINDER_META_INTERFACE(ServiceManager);
^
Test: mm
Change-Id: I3a2339dd1c9fe942123623e65799fddc4a56ff42
diff --git a/include/hidl/HidlSupport.h b/include/hidl/HidlSupport.h
index 760c7ab..f9f7f14 100644
--- a/include/hidl/HidlSupport.h
+++ b/include/hidl/HidlSupport.h
@@ -450,7 +450,7 @@
// Version functions
struct hidl_version {
public:
- constexpr hidl_version(uint16_t major, uint16_t minor) : mMajor(major), mMinor(minor) {};
+ constexpr hidl_version(uint16_t major, uint16_t minor) : mMajor(major), mMinor(minor) {}
bool operator==(const hidl_version& other) {
return (mMajor == other.get_major() && mMinor == other.get_minor());
@@ -460,7 +460,7 @@
constexpr uint16_t get_minor() const { return mMinor; }
android::status_t writeToParcel(android::hardware::Parcel& parcel) const {
- return parcel.writeUint32((uint32_t) mMajor << 16 | mMinor);
+ return parcel.writeUint32(static_cast<uint32_t>(mMajor) << 16 | mMinor);
}
static hidl_version* readFromParcel(const android::hardware::Parcel& parcel) {