From 4e9a0ac4dff472b2b2f55d5acb4d971d1f96d804 Mon Sep 17 00:00:00 2001 From: Peter Soetens Date: Mon, 30 Aug 2010 15:12:31 +0200 Subject: [PATCH 2/2] typekit: generate full_name with '.' separator, without leading separator. Signed-off-by: Peter Soetens --- .../templates/typekit/type_info/ArrayInfo.cpp | 2 +- lib/orogen/templates/typekit/type_info/Info.cpp | 2 +- .../templates/typekit/type_info/OpaqueInfo.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/orogen/templates/typekit/type_info/ArrayInfo.cpp b/lib/orogen/templates/typekit/type_info/ArrayInfo.cpp index c9c3a90..1a86754 100644 --- a/lib/orogen/templates/typekit/type_info/ArrayInfo.cpp +++ b/lib/orogen/templates/typekit/type_info/ArrayInfo.cpp @@ -9,7 +9,7 @@ namespace orogen_typekits { public <%= type.info_type %>< RTT::internal::carray< <%= type.deference.cxx_name %> > > { <%= type.deference.method_name(true) %>ArrayTypeInfo() - : <%= type.info_type %>< RTT::internal::carray< <%= type.deference.cxx_name %> > >("<%= type.deference.full_name %>[]") {} + : <%= type.info_type %>< RTT::internal::carray< <%= type.deference.cxx_name %> > >("<%= type.deference.full_name('.', true) %>[]") {} }; RTT::types::TypeInfo* <%= type.deference.method_name(true) %>_ArrayTypeInfo() diff --git a/lib/orogen/templates/typekit/type_info/Info.cpp b/lib/orogen/templates/typekit/type_info/Info.cpp index c8be9f0..08bfc3c 100644 --- a/lib/orogen/templates/typekit/type_info/Info.cpp +++ b/lib/orogen/templates/typekit/type_info/Info.cpp @@ -23,7 +23,7 @@ namespace orogen_typekits { public <%= type.info_type %>< <%= type.cxx_name %> > { <%= type.method_name(true) %>TypeInfo() - : <%= type.info_type %>< <%= type.cxx_name %> >("<%= type.full_name %>") {} + : <%= type.info_type %>< <%= type.cxx_name %> >("<%= type.full_name('.',true) %>") {} }; RTT::types::TypeInfo* <%= type.method_name(true) %>_TypeInfo() diff --git a/lib/orogen/templates/typekit/type_info/OpaqueInfo.cpp b/lib/orogen/templates/typekit/type_info/OpaqueInfo.cpp index fe1c25e..47e05e5 100644 --- a/lib/orogen/templates/typekit/type_info/OpaqueInfo.cpp +++ b/lib/orogen/templates/typekit/type_info/OpaqueInfo.cpp @@ -15,7 +15,7 @@ namespace orogen_typekits { typedef <%= type.cxx_name %> T; <%= type.method_name(true) %>TypeInfo() - : RTT::types::TemplateTypeInfo< <%= type.cxx_name %> >("<%= type.full_name %>") + : RTT::types::TemplateTypeInfo< <%= type.cxx_name %> >("<%= type.full_name('.', true) %>") { RTT::types::TypeInfoRepository::shared_ptr ti = RTT::types::TypeInfoRepository::Instance(); intermediate_type_info = dynamic_cast< IntermediateTypeInfo* >(ti->type("<%= intermediate_type.name %>")); -- 1.6.3.3