CommonAPI 3.1.4

1 files changed, 26 insertions, 26 deletions

diff --git a/include/CommonAPI/Runtime.hpp b/include/CommonAPI/Runtime.hpp
index 8d33d48..09c0d3c 100644
--- a/include/CommonAPI/Runtime.hpp
+++ b/include/CommonAPI/Runtime.hpp
@@ -41,89 +41,89 @@ public:
 
     COMMONAPI_EXPORT void init();
 
-    template<template<typename ...> class _ProxyClass, typename ... _AttributeExtensions>
+    template<template<typename ...> class ProxyClass_, typename ... AttributeExtensions_>
     COMMONAPI_EXPORT std::shared_ptr<
-        _ProxyClass<_AttributeExtensions...>
+        ProxyClass_<AttributeExtensions_...>
     >
     buildProxy(const std::string &_domain,
                const std::string &_instance,
                const ConnectionId_t &_connectionId = DEFAULT_CONNECTION_ID) {
         std::shared_ptr<Proxy> proxy
             = createProxy(_domain,
-                          _ProxyClass<_AttributeExtensions...>::getInterface(),
+                          ProxyClass_<AttributeExtensions_...>::getInterface(),
                           _instance,
                           _connectionId);
 
         if (proxy) {
-            return std::make_shared<_ProxyClass<_AttributeExtensions...>>(proxy);
+            return std::make_shared<ProxyClass_<AttributeExtensions_...>>(proxy);
         }
         return nullptr;
     }
 
-    template<template<typename ...> class _ProxyClass, typename ... _AttributeExtensions>
+    template<template<typename ...> class ProxyClass_, typename ... AttributeExtensions_>
     COMMONAPI_EXPORT std::shared_ptr<
-        _ProxyClass<_AttributeExtensions...>
+        ProxyClass_<AttributeExtensions_...>
     >
     buildProxy(const std::string &_domain,
                const std::string &_instance,
                std::shared_ptr<MainLoopContext> _context) {
         std::shared_ptr<Proxy> proxy
             = createProxy(_domain,
-                          _ProxyClass<_AttributeExtensions...>::getInterface(),
+                          ProxyClass_<AttributeExtensions_...>::getInterface(),
                           _instance,
                           _context);
         if (proxy) {
-            return std::make_shared<_ProxyClass<_AttributeExtensions...>>(proxy);
+            return std::make_shared<ProxyClass_<AttributeExtensions_...>>(proxy);
         }
         return nullptr;
     }
 
-    template <template<typename ...> class _ProxyClass, template<typename> class _AttributeExtension>
-    COMMONAPI_EXPORT std::shared_ptr<typename DefaultAttributeProxyHelper<_ProxyClass, _AttributeExtension>::class_t>
+    template <template<typename ...> class ProxyClass_, template<typename> class AttributeExtension_>
+    COMMONAPI_EXPORT std::shared_ptr<typename DefaultAttributeProxyHelper<ProxyClass_, AttributeExtension_>::class_t>
     buildProxyWithDefaultAttributeExtension(const std::string &_domain,
                                             const std::string &_instance,
                                             const ConnectionId_t &_connectionId = DEFAULT_CONNECTION_ID) {
         std::shared_ptr<Proxy> proxy
             = createProxy(_domain,
-                           DefaultAttributeProxyHelper<_ProxyClass, _AttributeExtension>::class_t::getInterface(),
+                           DefaultAttributeProxyHelper<ProxyClass_, AttributeExtension_>::class_t::getInterface(),
                           _instance,
                           _connectionId);
         if (proxy) {
-            return std::make_shared<typename DefaultAttributeProxyHelper<_ProxyClass, _AttributeExtension>::class_t>(proxy);
+            return std::make_shared<typename DefaultAttributeProxyHelper<ProxyClass_, AttributeExtension_>::class_t>(proxy);
         }
         return nullptr;
     }
 
-    template <template<typename ...> class _ProxyClass, template<typename> class _AttributeExtension>
-    COMMONAPI_EXPORT std::shared_ptr<typename DefaultAttributeProxyHelper<_ProxyClass, _AttributeExtension>::class_t>
+    template <template<typename ...> class ProxyClass_, template<typename> class AttributeExtension_>
+    COMMONAPI_EXPORT std::shared_ptr<typename DefaultAttributeProxyHelper<ProxyClass_, AttributeExtension_>::class_t>
     buildProxyWithDefaultAttributeExtension(const std::string &_domain,
                                             const std::string &_instance,
                                             std::shared_ptr<MainLoopContext> _context) {
         std::shared_ptr<Proxy> proxy
             = createProxy(_domain,
-                           DefaultAttributeProxyHelper<_ProxyClass, _AttributeExtension>::class_t::getInterface(),
+                           DefaultAttributeProxyHelper<ProxyClass_, AttributeExtension_>::class_t::getInterface(),
                           _instance,
                           _context);
         if (proxy) {
-            return std::make_shared<typename DefaultAttributeProxyHelper<_ProxyClass, _AttributeExtension>::class_t>(proxy);
+            return std::make_shared<typename DefaultAttributeProxyHelper<ProxyClass_, AttributeExtension_>::class_t>(proxy);
         }
         return nullptr;
     }
 
-    template<typename _Stub>
+    template<typename Stub_>
     COMMONAPI_EXPORT bool registerService(const std::string &_domain,
                          const std::string &_instance,
-                         std::shared_ptr<_Stub> _service,
+                         std::shared_ptr<Stub_> _service,
                          const ConnectionId_t &_connectionId = DEFAULT_CONNECTION_ID) {
-        return registerStub(_domain, _Stub::StubInterface::getInterface(), _instance, _service, _connectionId);
+        return registerStub(_domain, Stub_::StubInterface::getInterface(), _instance, _service, _connectionId);
     }
 
-    template<typename _Stub>
+    template<typename Stub_>
     COMMONAPI_EXPORT bool registerService(const std::string &_domain,
                          const std::string &_instance,
-                         std::shared_ptr<_Stub> _service,
+                         std::shared_ptr<Stub_> _service,
                          std::shared_ptr<MainLoopContext> _context) {
-        return registerStub(_domain, _Stub::StubInterface::getInterface(), _instance, _service, _context);
+        return registerStub(_domain, Stub_::StubInterface::getInterface(), _instance, _service, _context);
     }
 
     COMMONAPI_EXPORT bool unregisterService(const std::string &_domain,
@@ -147,9 +147,9 @@ private:
                                        std::shared_ptr<MainLoopContext>);
 
     COMMONAPI_EXPORT std::shared_ptr<Proxy> createProxyHelper(const std::string &, const std::string &, const std::string &,
-                                             const ConnectionId_t &);
+                                             const ConnectionId_t &, bool);
     COMMONAPI_EXPORT std::shared_ptr<Proxy> createProxyHelper(const std::string &, const std::string &, const std::string &,
-                                             std::shared_ptr<MainLoopContext>);
+                                             std::shared_ptr<MainLoopContext>, bool);
 
 
     COMMONAPI_EXPORT bool registerStub(const std::string &, const std::string &, const std::string &,
@@ -157,9 +157,9 @@ private:
     COMMONAPI_EXPORT bool registerStub(const std::string &, const std::string &, const std::string &,
                       std::shared_ptr<StubBase>, std::shared_ptr<MainLoopContext>);
     COMMONAPI_EXPORT bool registerStubHelper(const std::string &, const std::string &, const std::string &,
-                            std::shared_ptr<StubBase>, const ConnectionId_t &);
+                            std::shared_ptr<StubBase>, const ConnectionId_t &, bool);
     COMMONAPI_EXPORT bool registerStubHelper(const std::string &, const std::string &, const std::string &,
-                            std::shared_ptr<StubBase>, std::shared_ptr<MainLoopContext>);
+                            std::shared_ptr<StubBase>, std::shared_ptr<MainLoopContext>, bool);
 
     COMMONAPI_EXPORT bool unregisterStub(const std::string &, const std::string &, const std::string &);