diff options
Diffstat (limited to 'cpp/rubygen/99-0')
| -rw-r--r-- | cpp/rubygen/99-0/Session.rb | 11 | ||||
| -rw-r--r-- | cpp/rubygen/99-0/structs.rb | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/cpp/rubygen/99-0/Session.rb b/cpp/rubygen/99-0/Session.rb index 1ec78f6167..8e14d8daf9 100644 --- a/cpp/rubygen/99-0/Session.rb +++ b/cpp/rubygen/99-0/Session.rb @@ -8,7 +8,7 @@ class CppGen def session_methods excludes = ["channel", "connection", "session", "execution"] gen_methods=@amqp.methods_on(@chassis).reject { |m| - excludes.include? m.parent.name or m.body_name.include?("010") + excludes.include? m.classname or !m.parent.name.include?("010") } end @@ -43,7 +43,7 @@ class AmqpMethod def param_names_c() fields_c.map { |f| f.cppname} end def signature_c() fields_c.map { |f| f.signature }; end def sig_c_default() fields_c.map { |f| f.sig_default }; end - def argpack_name() "#{parent.cppname}#{name.caps}Parameters"; end + def argpack_name() "#{classname.lcaps.cppsafe}#{name.caps}Parameters"; end def argpack_type() "boost::parameter::parameters<" + fields_c.map { |f| "arg::keyword_tags::"+f.cppname }.join(',') + @@ -54,7 +54,7 @@ class AmqpMethod return "Response" if (not responses().empty?) return "Completion" end - def session_function() "#{parent.name.lcaps}#{name.caps}"; end + def session_function() "#{classname.lcaps}#{name.caps}"; end end class SessionNoKeywordGen < CppGen @@ -75,6 +75,7 @@ class SessionNoKeywordGen < CppGen genl "using framing::Content;" genl "using framing::FieldTable;" genl "using framing::MethodContent;" + genl "using framing::SequenceSet;" genl "using framing::SequenceNumberSet;" genl "using framing::Uuid;" genl @@ -86,7 +87,7 @@ class SessionNoKeywordGen < CppGen cpp_class(@classname, "public SessionBase") { public genl "Session_#{@amqp.version.bars}() {}" - genl "Session_#{@amqp.version.bars}(shared_ptr<SessionCore> core) : SessionBase(core) {}" + genl "Session_#{@amqp.version.bars}(shared_ptr<SessionImpl> core) : SessionBase(core) {}" session_methods.each { |m| genl doxygen(m) @@ -180,7 +181,7 @@ EOS # Session class. cpp_class(@classname,"public #{@base}") { private - genl "#{@classname}(shared_ptr<SessionCore> core) : #{ @base}(core) {}" + genl "#{@classname}(shared_ptr<SessionImpl> core) : #{ @base}(core) {}" keyword_methods.each { |m| typedef m.argpack_type, m.argpack_name } genl "friend class Connection;" public diff --git a/cpp/rubygen/99-0/structs.rb b/cpp/rubygen/99-0/structs.rb index 58e175af0f..b7d230d528 100644 --- a/cpp/rubygen/99-0/structs.rb +++ b/cpp/rubygen/99-0/structs.rb @@ -35,7 +35,7 @@ class StructGen < CppGen def is_packed(s) #return true - s.kind_of?(AmqpStruct) or s.body_name.include?("010") + s.kind_of?(AmqpStruct) or s.parent.name.include?("010") end def execution_header?(s) |