diff options
author | Dirk Huss <dirk_huss@mentor.com> | 2015-12-09 14:30:44 +0100 |
---|---|---|
committer | Dirk Huss <dirk_huss@mentor.com> | 2015-12-09 14:30:44 +0100 |
commit | 77d9cdaf6acee03a1e360e0e1a3cd0b01a95b407 (patch) | |
tree | 4ed26f279ad0ae147af50d4a85072ebed751ce26 /include | |
parent | b545ed39392a73c1f3c432ec6ae3558f6ab161d5 (diff) | |
download | genivi-common-api-runtime-77d9cdaf6acee03a1e360e0e1a3cd0b01a95b407.tar.gz |
CommonAPI 3.1.5list
Diffstat (limited to 'include')
-rw-r--r-- | include/CommonAPI/ProxyManager.hpp | 6 | ||||
-rw-r--r-- | include/CommonAPI/Variant.hpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/CommonAPI/ProxyManager.hpp b/include/CommonAPI/ProxyManager.hpp index d7bcada..52d666c 100644 --- a/include/CommonAPI/ProxyManager.hpp +++ b/include/CommonAPI/ProxyManager.hpp @@ -18,6 +18,7 @@ #include <CommonAPI/Event.hpp> #include <CommonAPI/Proxy.hpp> #include <CommonAPI/Types.hpp> +#include <CommonAPI/Runtime.hpp> namespace CommonAPI { @@ -52,13 +53,12 @@ public: template<template<typename ...> class ProxyClass_, typename ... AttributeExtensions_> std::shared_ptr<ProxyClass_<AttributeExtensions_...> > - buildProxy(const std::string &_instance) { - std::shared_ptr<Proxy> proxy = createProxy(getDomain(), getInterface(), _instance, getConnectionId()); + buildProxy(const std::string &_instance, const ConnectionId_t& _connectionId = DEFAULT_CONNECTION_ID) { + std::shared_ptr<Proxy> proxy = createProxy(getDomain(), getInterface(), _instance, (DEFAULT_CONNECTION_ID == _connectionId) ? getConnectionId() : _connectionId); if (proxy) { return std::make_shared<ProxyClass_<AttributeExtensions_...>>(proxy); } return NULL; - } protected: diff --git a/include/CommonAPI/Variant.hpp b/include/CommonAPI/Variant.hpp index 34304b9..4500aae 100644 --- a/include/CommonAPI/Variant.hpp +++ b/include/CommonAPI/Variant.hpp @@ -197,6 +197,10 @@ public: return valueType_; } + uint8_t getMaxValueType() const { + return uint8_t(TypesTupleSize::value); + } + private: template<typename Type_> void set(const Type_ &_value, const bool clear); |