From f82c2029963a67ee6586ab03c7f5ef3f2a728c0b Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 9 Aug 2007 22:31:59 +0000 Subject: * src/qpid/framing/MethodHolder.h, .cpp: Replace boost::variant with Blob. * rubygen/templates/MethodHolder.rb: Generate support files for Blob-based MethodHolder. * src/Makefile.am: generate MethodHolder suppport files. * rubygen/cppgen.rb: Minor fixes/enhancements. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@564409 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/rubygen/cppgen.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'cpp/rubygen/cppgen.rb') diff --git a/cpp/rubygen/cppgen.rb b/cpp/rubygen/cppgen.rb index 8feaeb9ba5..64987e763f 100755 --- a/cpp/rubygen/cppgen.rb +++ b/cpp/rubygen/cppgen.rb @@ -136,7 +136,9 @@ class CppGen < Generator end def include(header) - genl /<.*>/.match(header) ? "#include #{header}" : "#include \"#{header}\"" + header+=".h" unless /(\.h|[">])$/===header + header="\"#{header}\"" unless /(^<.*>$)|(^".*"$)/===header + genl "#include #{header}" end def scope(open="{",close="}", &block) @@ -154,11 +156,11 @@ class CppGen < Generator genl end - def struct_class(type, name, *bases, &block) + def struct_class(type, name, bases, &block) genl gen "#{type} #{name}" gen ": #{bases.join(', ')}" unless bases.empty? - scope(" {","};", &block) + scope(" {","};") { yield } end def struct(name, *bases, &block) struct_class("struct", name, bases, &block); end -- cgit v1.2.1