From 468c9698d0231608b502fec7c7352af3245cd74f Mon Sep 17 00:00:00 2001 From: Reinhard Pfau Date: Wed, 24 Oct 2007 12:23:55 +0000 Subject: [PATCH] libt2n: (reinhard) little bugfix in codegen for dealing with nested namespaces; increased version number to 0.3.1 --- codegen/main.cpp | 5 +++-- configure.in | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/codegen/main.cpp b/codegen/main.cpp index c7f5b2c..f276e98 100644 --- a/codegen/main.cpp +++ b/codegen/main.cpp @@ -102,8 +102,9 @@ std::string get_namespace(const xmlpp::Element* root, const std::string &id) { std::string error; const xmlpp::Element* element(get_element_by_id(root, id)); - if ((!element)||(!element->get_attribute("name"))) return error; - return element->get_attribute("name")->get_value(); + // [RP:20071024]: use "demangled" attribute instead of "name" to cover nested namespaces: + if ((!element)||(!element->get_attribute("demangled"))) return error; + return element->get_attribute("demangled")->get_value(); } //! procedure marked for export? diff --git a/configure.in b/configure.in index c293a10..03adbf1 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ AC_INIT(configure.in) AM_CONFIG_HEADER(config.h) dnl AC_CONFIG_HEADERS([config.h:config.h.in]) -AM_INIT_AUTOMAKE(libt2n, 0.3) +AM_INIT_AUTOMAKE(libt2n, 0.3.1) AC_DEFINE(PROTOCOL_VERSION, 1, [protocol version used (integers, increase version if incompatible)]) -- 1.7.1