From 121ed1a9751a9a69263cb443a3a958f27a5c3f1e Mon Sep 17 00:00:00 2001 From: Stanislav Angelovic Date: Sun, 5 Jan 2020 12:52:37 +0100 Subject: [PATCH] Fix clang-8 compilation errors and warnings --- include/sdbus-c++/ConvenienceApiClasses.h | 6 ------ include/sdbus-c++/Error.h | 2 ++ tests/unittests/Types_test.cpp | 10 +++++----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/include/sdbus-c++/ConvenienceApiClasses.h b/include/sdbus-c++/ConvenienceApiClasses.h index bc530f0..52a4f88 100644 --- a/include/sdbus-c++/ConvenienceApiClasses.h +++ b/include/sdbus-c++/ConvenienceApiClasses.h @@ -50,7 +50,6 @@ namespace sdbus { public: MethodRegistrator(IObject& object, const std::string& methodName); MethodRegistrator(MethodRegistrator&& other) = default; - MethodRegistrator& operator=(MethodRegistrator&& other) = default; ~MethodRegistrator() noexcept(false); MethodRegistrator& onInterface(std::string interfaceName); @@ -78,7 +77,6 @@ namespace sdbus { public: SignalRegistrator(IObject& object, const std::string& signalName); SignalRegistrator(SignalRegistrator&& other) = default; - SignalRegistrator& operator=(SignalRegistrator&& other) = default; ~SignalRegistrator() noexcept(false); SignalRegistrator& onInterface(std::string interfaceName); @@ -99,7 +97,6 @@ namespace sdbus { public: PropertyRegistrator(IObject& object, const std::string& propertyName); PropertyRegistrator(PropertyRegistrator&& other) = default; - PropertyRegistrator& operator=(PropertyRegistrator&& other) = default; ~PropertyRegistrator() noexcept(false); PropertyRegistrator& onInterface(std::string interfaceName); @@ -125,7 +122,6 @@ namespace sdbus { public: InterfaceFlagsSetter(IObject& object, const std::string& interfaceName); InterfaceFlagsSetter(InterfaceFlagsSetter&& other) = default; - InterfaceFlagsSetter& operator=(InterfaceFlagsSetter&& other) = default; ~InterfaceFlagsSetter() noexcept(false); InterfaceFlagsSetter& markAsDeprecated(); @@ -145,7 +141,6 @@ namespace sdbus { public: SignalEmitter(IObject& object, const std::string& signalName); SignalEmitter(SignalEmitter&& other) = default; - SignalEmitter& operator=(SignalEmitter&& other) = default; ~SignalEmitter() noexcept(false); SignalEmitter& onInterface(const std::string& interfaceName); template void withArguments(_Args&&... args); @@ -162,7 +157,6 @@ namespace sdbus { public: MethodInvoker(IProxy& proxy, const std::string& methodName); MethodInvoker(MethodInvoker&& other) = default; - MethodInvoker& operator=(MethodInvoker&& other) = default; ~MethodInvoker() noexcept(false); MethodInvoker& onInterface(const std::string& interfaceName); diff --git a/include/sdbus-c++/Error.h b/include/sdbus-c++/Error.h index f627e01..92aeca2 100644 --- a/include/sdbus-c++/Error.h +++ b/include/sdbus-c++/Error.h @@ -27,7 +27,9 @@ #ifndef SDBUS_CXX_ERROR_H_ #define SDBUS_CXX_ERROR_H_ +#include #include +#include namespace sdbus { diff --git a/tests/unittests/Types_test.cpp b/tests/unittests/Types_test.cpp index deac3f7..f0d8f2b 100644 --- a/tests/unittests/Types_test.cpp +++ b/tests/unittests/Types_test.cpp @@ -67,7 +67,7 @@ TEST(AVariant, CanBeConstructedFromASimpleValue) TEST(AVariant, CanBeConstructedFromAComplexValue) { using ComplexType = std::map>>; - ComplexType value{ {ANY_UINT64, ComplexType::mapped_type{sdbus::make_struct("hello", ANY_DOUBLE), sdbus::make_struct("world", ANY_DOUBLE)}} }; + ComplexType value{ {ANY_UINT64, ComplexType::mapped_type{sdbus::make_struct("hello"s, ANY_DOUBLE), sdbus::make_struct("world"s, ANY_DOUBLE)}} }; ASSERT_NO_THROW(sdbus::Variant(value)); } @@ -103,7 +103,7 @@ TEST(ASimpleVariant, ReturnsTheSimpleValueWhenAsked) TEST(AComplexVariant, ReturnsTheComplexValueWhenAsked) { using ComplexType = std::map>>; - ComplexType value{ {ANY_UINT64, ComplexType::mapped_type{sdbus::make_struct("hello", ANY_DOUBLE), sdbus::make_struct("world", ANY_DOUBLE)}} }; + ComplexType value{ {ANY_UINT64, ComplexType::mapped_type{sdbus::make_struct("hello"s, ANY_DOUBLE), sdbus::make_struct("world"s, ANY_DOUBLE)}} }; sdbus::Variant variant(value); @@ -123,7 +123,7 @@ TEST(AVariant, HasConceptuallyNonmutableGetMethodWhichCanBeCalledXTimes) TEST(AVariant, ReturnsTrueWhenAskedIfItContainsTheTypeItReallyContains) { using ComplexType = std::map>>; - ComplexType value{ {ANY_UINT64, ComplexType::mapped_type{sdbus::make_struct("hello", ANY_DOUBLE), sdbus::make_struct("world", ANY_DOUBLE)}} }; + ComplexType value{ {ANY_UINT64, ComplexType::mapped_type{sdbus::make_struct("hello"s, ANY_DOUBLE), sdbus::make_struct("world"s, ANY_DOUBLE)}} }; sdbus::Variant variant(value); @@ -172,7 +172,7 @@ TEST(AnEmptyVariant, ThrowsWhenBeingSerializedToAMessage) TEST(ANonEmptyVariant, SerializesToAndDeserializesFromAMessageSuccessfully) { using ComplexType = std::map>>; - ComplexType value{ {ANY_UINT64, ComplexType::mapped_type{sdbus::make_struct("hello", ANY_DOUBLE), sdbus::make_struct("world", ANY_DOUBLE)}} }; + ComplexType value{ {ANY_UINT64, ComplexType::mapped_type{sdbus::make_struct("hello"s, ANY_DOUBLE), sdbus::make_struct("world"s, ANY_DOUBLE)}} }; sdbus::Variant variant(value); auto msg = sdbus::createPlainMessage(); @@ -187,7 +187,7 @@ TEST(ANonEmptyVariant, SerializesToAndDeserializesFromAMessageSuccessfully) TEST(CopiesOfVariant, SerializeToAndDeserializeFromMessageSuccessfully) { using ComplexType = std::map>>; - ComplexType value{ {ANY_UINT64, ComplexType::mapped_type{sdbus::make_struct("hello", ANY_DOUBLE), sdbus::make_struct("world", ANY_DOUBLE)}} }; + ComplexType value{ {ANY_UINT64, ComplexType::mapped_type{sdbus::make_struct("hello"s, ANY_DOUBLE), sdbus::make_struct("world"s, ANY_DOUBLE)}} }; sdbus::Variant variant(value); auto variantCopy1{variant}; auto variantCopy2 = variant;