From 77d9cdaf6acee03a1e360e0e1a3cd0b01a95b407 Mon Sep 17 00:00:00 2001
From: Dirk Huss <dirk_huss@mentor.com>
Date: Wed, 9 Dec 2015 14:30:44 +0100
Subject: CommonAPI 3.1.5

---
 include/CommonAPI/ProxyManager.hpp | 6 +++---
 include/CommonAPI/Variant.hpp      | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'include')

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);
-- 
cgit v1.2.1