From 13b127caa24f036871e3e8b2b0051ab93d7be646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 6 Apr 2017 11:01:04 +0200 Subject: [PATCH] C++ wrapper: systematically include object.hh in each generated header file --- wrappers/cpp/class_header.mustache | 1 + wrappers/cpp/genwrapper.py | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/wrappers/cpp/class_header.mustache b/wrappers/cpp/class_header.mustache index d3ed12f23..b228eb93f 100644 --- a/wrappers/cpp/class_header.mustache +++ b/wrappers/cpp/class_header.mustache @@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "{{name}}.hh" {{/internal}} {{/includes}} +#include "object.hh" {{#_class}}{{#isVcard}} #include diff --git a/wrappers/cpp/genwrapper.py b/wrappers/cpp/genwrapper.py index caf8eec6b..2a0080a93 100755 --- a/wrappers/cpp/genwrapper.py +++ b/wrappers/cpp/genwrapper.py @@ -593,8 +593,6 @@ class ClassHeader(object): includes = {'internal': [], 'external': []} if type(_class) is AbsApi.Class: - self._add_include(includes, 'internal', 'object') - for _property in _class.properties: if _property.setter is not None: self._needed_includes_from_method(_property.setter, includes)