[C++] IR was losing type information with the use of constant enums. Full enums are serialised and fields retain the constant property and encoded length rather than the type. Issue #560.

Author: mjpt777

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java

@@ -1712,7 +1712,7 @@ private CharSequence generateEnumProperty(
 
         final StringBuilder sb = new StringBuilder();
 
-        if (token.isConstantEncoding())
+        if (signalToken.isConstantEncoding())
         {
             final String constValue = signalToken.encoding().constValue().toString();
 

sbe-tool/src/test/cpp/Rc3OtfFullIrTest.cpp

@@ -640,28 +640,9 @@ class Rc3OtfFullIrTest : public testing::Test
             {
                 EXPECT_EQ(fieldToken.fieldId(), fieldIdDiscountedModel);
                 EXPECT_EQ(encoding.primitiveType(), PrimitiveType::CHAR);
-                EXPECT_EQ(encoding.presence(), Presence::SBE_CONSTANT);
-                EXPECT_TRUE(typeToken.isConstantEncoding());
-                EXPECT_EQ(typeToken.encodedLength(), 0);
-
-                const PrimitiveValue value = encoding.constValue();
-
-                EXPECT_EQ(value.getAsInt(), static_cast<std::int64_t>('C'));
-                bool found = false;
-                for (size_t i = fromIndex + 1; i < toIndex; i++)
-                {
-                    const Token& token = tokens.at(i);
-                    const std::int64_t constValue = token.encoding().constValue().getAsInt();
-
-                    std::cout << "    " << token.name() << " = " << constValue << "\n";
-
-                    if (constValue == value.getAsInt())
-                    {
-                        EXPECT_EQ(token.name(), std::string("C"));
-                        found = true;
-                    }
-                }
-                EXPECT_TRUE(found);
+                EXPECT_TRUE(fieldToken.isConstantEncoding());
+                EXPECT_EQ(fieldToken.encodedLength(), 0);
+                EXPECT_EQ(std::string(fieldToken.encoding().constValue().getArray()), std::string("Model.C"));
                 break;
             }