diff options
| author | Johannes Schanda <schanda@itestra.de> | 2013-05-10 13:00:57 +0200 |
|---|---|---|
| committer | Johannes Schanda <schanda@itestra.de> | 2013-05-10 13:00:57 +0200 |
| commit | 86a2534764fbf816dd4ed23c330163db376d329d (patch) | |
| tree | a0ee504cb40761cf31e12d701a9c638aa32de9b9 | |
| parent | c4970e91eb70772d4caf76bb459fbe1e3248a565 (diff) | |
| download | genivi-common-api-dbus-runtime-86a2534764fbf816dd4ed23c330163db376d329d.tar.gz | |
Change sync attribute getter to match all other sync methods2.0.3
| -rw-r--r-- | src/CommonAPI/DBus/DBusAttribute.h | 4 | ||||
| -rw-r--r-- | src/CommonAPI/DBus/DBusDaemonProxy.cpp | 5 | ||||
| -rw-r--r-- | src/CommonAPI/DBus/DBusDaemonProxy.h | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/CommonAPI/DBus/DBusAttribute.h b/src/CommonAPI/DBus/DBusAttribute.h index 04d1e72..4844b87 100644 --- a/src/CommonAPI/DBus/DBusAttribute.h +++ b/src/CommonAPI/DBus/DBusAttribute.h @@ -31,11 +31,9 @@ class DBusReadonlyAttribute: public _AttributeType { assert(getMethodName); } - CallStatus getValue(ValueType& value) const { - CallStatus callStatus; + void getValue(CallStatus& callStatus, ValueType& value) const { DBusProxyHelper<DBusSerializableArguments<>, DBusSerializableArguments<ValueType> >::callMethodWithReply(dbusProxy_, getMethodName_, "", callStatus, value); - return callStatus; } std::future<CallStatus> getValueAsync(AttributeAsyncCallback attributeAsyncCallback) { diff --git a/src/CommonAPI/DBus/DBusDaemonProxy.cpp b/src/CommonAPI/DBus/DBusDaemonProxy.cpp index 539a71e..fe81995 100644 --- a/src/CommonAPI/DBus/DBusDaemonProxy.cpp +++ b/src/CommonAPI/DBus/DBusDaemonProxy.cpp @@ -15,10 +15,9 @@ StaticInterfaceVersionAttribute::StaticInterfaceVersionAttribute(const uint32_t& version_(majorValue, minorValue) { } -CallStatus StaticInterfaceVersionAttribute::getValue(Version& version) const { +void StaticInterfaceVersionAttribute::getValue(CallStatus& callStatus, Version& version) const { version = version_; - - return CallStatus::SUCCESS; + callStatus = CallStatus::SUCCESS; } std::future<CallStatus> StaticInterfaceVersionAttribute::getValueAsync(AttributeAsyncCallback attributeAsyncCallback) { diff --git a/src/CommonAPI/DBus/DBusDaemonProxy.h b/src/CommonAPI/DBus/DBusDaemonProxy.h index 9fa2cd2..0053c1b 100644 --- a/src/CommonAPI/DBus/DBusDaemonProxy.h +++ b/src/CommonAPI/DBus/DBusDaemonProxy.h @@ -22,7 +22,7 @@ class StaticInterfaceVersionAttribute: public InterfaceVersionAttribute { public: StaticInterfaceVersionAttribute(const uint32_t& majorValue, const uint32_t& minorValue); - CallStatus getValue(Version& version) const; + void getValue(CallStatus& callStatus, Version& version) const; std::future<CallStatus> getValueAsync(AttributeAsyncCallback attributeAsyncCallback); private: |