Fixes

    * ridlbe/c++11/visitors/struct.rb:
    * tests/idl4/struct_cppmapping/test.idl:

ridlbe/c++11/visitors/struct.rb

@@ -36,25 +36,25 @@ def base
 
       # Which cpp_mapping we should use, default to class with methods
       def cpp_mapping
-        return 'CLASS_WITH_PUBLIC_ACCESSORS_AND_MODIFIERS' unless node.annotations[:cpp_mapping].first.nil?
-        node.annotations[:cpp_mapping].first
+        return 'CLASS_WITH_PUBLIC_ACCESSORS_AND_MODIFIERS' if node.annotations[:cpp_mapping].first.nil?
+        node.annotations[:cpp_mapping].first.fields[:value]
       end
 
       # How can we access a struct member, directly or through a method call
       def member_accessor
-        ' ()' if cpp_mapping == 'CLASS_WITH_PUBLIC_ACCESSORS_AND_MODIFIERS'
+        return ' ()' if cpp_mapping == 'CLASS_WITH_PUBLIC_ACCESSORS_AND_MODIFIERS'
         ''
       end
 
       # Possible postfix for all members in C++
       def member_postfix
-        '_' if cpp_mapping == 'CLASS_WITH_PUBLIC_ACCESSORS_AND_MODIFIERS'
+        return '_' if cpp_mapping == 'CLASS_WITH_PUBLIC_ACCESSORS_AND_MODIFIERS'
         ''
       end
 
       # Do we map to a C++ class or struct
       def class_struct
-        'class' if cpp_mapping == 'CLASS_WITH_PUBLIC_ACCESSORS_AND_MODIFIERS'
+        return 'class' if cpp_mapping == 'CLASS_WITH_PUBLIC_ACCESSORS_AND_MODIFIERS'
         'struct'
       end
 

tests/idl4/struct_cppmapping/test.idl

@@ -5,12 +5,12 @@
  * @copyright Copyright (c) Remedy IT Expertise BV
  */
 
-@struct_mapping(STRUCT_WITH_PUBLIC_MEMBERS)
+@cpp_mapping(STRUCT_WITH_PUBLIC_MEMBERS)
 struct bar_struct {
   short b;
 };
 
-@struct_mapping(CLASS_WITH_PUBLIC_ACCESSORS_AND_MODIFIERS)
+@cpp_mapping(CLASS_WITH_PUBLIC_ACCESSORS_AND_MODIFIERS)
 struct bar_class {
   short b;
 };