X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Fafb%2Fc%2B%2B%2Fbinding-object.hpp;h=813c62188e800d83e07e8032a9f2d40e141239a7;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=b85331cdce60e7dde5a0424cac366565996f878c;hpb=502927c390598c842e7306ce1879a727125c3557;p=src%2Fapp-framework-binder.git

diff --git a/include/afb/c++/binding-object.hpp b/include/afb/c++/binding-object.hpp
index b85331cd..813c6218 100644
--- a/include/afb/c++/binding-object.hpp
+++ b/include/afb/c++/binding-object.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
- * Copyright (C) 2018 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author Loïc Collignon <loic.collignon@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-extern "C" {
-#include <afb/afb-binding.h>
-}
+#include <afb/c++/binding-wrap.hpp>
 #include <cassert>
 #include <string>
 
@@ -93,7 +91,7 @@ namespace afb
 				return -2;
 			}
 
-			api->handle_ = handle;
+			api->api_ = handle;
 			return api->preinit(handle);
 		}
 
@@ -201,6 +199,7 @@ namespace afb
 		typename TTraits = ApiTraits<TApi>
 	>
 	class base_api_t
+		: public api
 	{
 		friend TTraits;
 
@@ -213,8 +212,6 @@ namespace afb
 		base_api_t& operator=(const base_api_t&) = delete;
 
 	protected:
-		afb_api_t handle_;
-
 		/**
 		 * @brief Default constructor.
 		 */
@@ -239,7 +236,7 @@ namespace afb
 		int add_verb(const std::string& verb, const std::string& info, void* vcbdata = nullptr, const struct afb_auth* auth = nullptr, uint32_t session = AFB_SESSION_NONE_X2, int glob = 0)
 		{
 			return afb_api_add_verb(
-				handle_,
+				api_,
 				verb.c_str(),
 				info == "" ? nullptr : info.c_str(),
 				TTraits::template verb<Callback>,
@@ -264,7 +261,7 @@ namespace afb
 		int add_verb(const std::string& verb, const std::string& info, void* vcbdata = nullptr, const struct afb_auth* auth = nullptr, uint32_t session = AFB_SESSION_NONE_X2, int glob = 0)
 		{
 			return afb_api_add_verb(
-				handle_,
+				api_,
 				verb.c_str(),
 				info == "" ? nullptr : info.c_str(),
 				TTraits::template verb<Callback>,
@@ -285,21 +282,21 @@ namespace afb
 		 * @brief Get the API's handle.
 		 * @return The API's handle.
 		 */
-		afb_api_t handle() const { return handle_; }
+		afb_api_t handle() const { return api_; }
 
 		/**
 		 * @brief Implicit conversion to C handle.
 		 * @return The API's handle.
 		 */
-		operator afb_api_t() const { return handle_; }
+		operator afb_api_t() const { return api_; }
 
 		/**
 		 * @brief Destructor.
 		 */
 		virtual ~base_api_t()
 		{
-			if (handle_ && afb_api_delete_api(handle_))
-				AFB_API_ERROR(handle_, "Failed to delete API.");
+			if (api_ && afb_api_delete_api(api_))
+				AFB_API_ERROR(api_, "Failed to delete API.");
 		}
 
 		/**