From db23ca90866955d2a551011a4856310cc50bd55f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Thu, 12 Jan 2017 18:25:29 +0100
Subject: [PATCH] C++ wrapper: syntax error in the generated C++ code

---
 wrappers/cpp/abstractapi.py      | 2 +-
 wrappers/cpp/class_impl.mustache | 2 +-
 wrappers/cpp/genheaders.py       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wrappers/cpp/abstractapi.py b/wrappers/cpp/abstractapi.py
index 65f9ad1ab..b2403b1ce 100644
--- a/wrappers/cpp/abstractapi.py
+++ b/wrappers/cpp/abstractapi.py
@@ -408,7 +408,7 @@ class CParser(object):
 		self.cBaseType = ['void', 'bool_t', 'char', 'short', 'int', 'long', 'size_t', 'time_t', 'float', 'double']
 		self.cListType = 'bctbx_list_t'
 		self.regexFixedSizeInteger = '^(u?)int(\d?\d)_t$'
-		self.methodBl = ['ref', 'unref', 'new', 'destroy', 'getCurrentCallbacks']
+		self.methodBl = ['ref', 'unref', 'new', 'destroy', 'getCurrentCallbacks', 'setUserData', 'getUserData']
 		self.functionBl = ['linphone_tunnel_get_http_proxy',
 					   'linphone_core_can_we_add_call',
 					   'linphone_core_get_default_proxy',
diff --git a/wrappers/cpp/class_impl.mustache b/wrappers/cpp/class_impl.mustache
index bfdccbcb8..ef3fcaaf2 100644
--- a/wrappers/cpp/class_impl.mustache
+++ b/wrappers/cpp/class_impl.mustache
@@ -99,7 +99,7 @@ std::shared_ptr<Core> Factory::createCoreWithConfig(const std::shared_ptr<CoreLi
 	LinphoneCoreCbs *cbs = linphone_core_get_current_callbacks(lc);
 	CoreListener *listener = (CoreListener *)linphone_core_cbs_get_user_data(cbs);
 	{{/ismultilistenable}}
-	{{#hasReturnValue}}return {{/hasReturnValue}}{{{cppMethodCallingLine}}}
+	{{#hasReturnValue}}return {{/hasReturnValue}}{{{cppMethodCallingLine}}};
 }
 {{/wrapperCbs}}
 
diff --git a/wrappers/cpp/genheaders.py b/wrappers/cpp/genheaders.py
index e5677e304..c40d8cddf 100755
--- a/wrappers/cpp/genheaders.py
+++ b/wrappers/cpp/genheaders.py
@@ -130,7 +130,7 @@ class CppTranslator(object):
 		wrapperCbDict['hasReturnValue'] = (params['returnType'] != 'void')
 		wrapperCbDict['hasNotReturnValue'] = not wrapperCbDict['hasReturnValue']
 		wrapperCbDict['callbackSetter'] = listenedClass.name.to_snake_case(fullName=True) + '_cbs_set_' + method.name.to_snake_case()[3:]
-		wrapperCbDict['cppMethodCallingLine'] = 'listener->{methodName}({wrappedArgs});'.format(
+		wrapperCbDict['cppMethodCallingLine'] = 'listener->{methodName}({wrappedArgs})'.format(
 			methodName=method.name.to_camel_case(lower=True),
 			wrappedArgs=', '.join(wrappedArgs))
 		wrapperCbDict['cppMethodCallingLine'] = CppTranslator._wrap_cpp_expression_to_c(self,