changed serialized presence constants to avoid conflicts in C++

Author: tmontgomery

main/cpp/otf_api/Ir.cpp

@@ -381,7 +381,7 @@ void Ir::addToken(::uint32_t offset,
  .signal((SignalCodec::Value)signal)
  .primitiveType((PrimitiveTypeCodec::Value)primitiveType)
  .byteOrder((ByteOrderCodec::Value)byteOrder)
- .presence((constValue != NULL ? PresenceCodec::OPTIONAL : PresenceCodec::REQUIRED));
+ .presence((constValue != NULL ? PresenceCodec::SBE_OPTIONAL : PresenceCodec::SBE_REQUIRED));
 
  tokenCodec.putName(name.c_str(), name.size());
  tokenCodec.putConstValue(constValue, constValueLength);

main/cpp/uk_co_real_logic_sbe_ir_generated/FrameCodec.hpp

@@ -6,11 +6,11 @@
 #include <math.h>
 #include "sbe/sbe.hpp"
 
-#include "uk_co_real_logic_sbe_ir_generated/VarDataEncoding.hpp"
 #include "uk_co_real_logic_sbe_ir_generated/ByteOrderCodec.hpp"
+#include "uk_co_real_logic_sbe_ir_generated/SignalCodec.hpp"
 #include "uk_co_real_logic_sbe_ir_generated/PresenceCodec.hpp"
 #include "uk_co_real_logic_sbe_ir_generated/PrimitiveTypeCodec.hpp"
-#include "uk_co_real_logic_sbe_ir_generated/SignalCodec.hpp"
+#include "uk_co_real_logic_sbe_ir_generated/VarDataEncoding.hpp"
 
 using namespace sbe;
 
@@ -267,6 +267,18 @@ class FrameCodec
  return *this;
  }
 
+ static const char *packageNameMetaAttribute(const MetaAttribute::Attribute metaAttribute)
+ {
+ switch (metaAttribute)
+ {
+ case MetaAttribute::EPOCH: return "unix";
+ case MetaAttribute::TIME_UNIT: return "nanosecond";
+ case MetaAttribute::SEMANTIC_TYPE: return "";
+ }
+
+ return "";
+ }
+
  static const char *packageNameCharacterEncoding()
  {
  return "UTF-8";
@@ -288,18 +300,6 @@ class FrameCodec
  }
 
 
- static const char *packageNameMetaAttribute(const MetaAttribute::Attribute metaAttribute)
- {
- switch (metaAttribute)
- {
- case MetaAttribute::EPOCH: return "unix";
- case MetaAttribute::TIME_UNIT: return "nanosecond";
- case MetaAttribute::SEMANTIC_TYPE: return "";
- }
-
- return "";
- }
-
  static int packageNameHeaderSize()
  {
  return 1;
@@ -340,6 +340,18 @@ class FrameCodec
  return length;
  }
 
+ static const char *namespaceNameMetaAttribute(const MetaAttribute::Attribute metaAttribute)
+ {
+ switch (metaAttribute)
+ {
+ case MetaAttribute::EPOCH: return "unix";
+ case MetaAttribute::TIME_UNIT: return "nanosecond";
+ case MetaAttribute::SEMANTIC_TYPE: return "";
+ }
+
+ return "";
+ }
+
  static const char *namespaceNameCharacterEncoding()
  {
  return "UTF-8";
@@ -361,18 +373,6 @@ class FrameCodec
  }
 
 
- static const char *namespaceNameMetaAttribute(const MetaAttribute::Attribute metaAttribute)
- {
- switch (metaAttribute)
- {
- case MetaAttribute::EPOCH: return "unix";
- case MetaAttribute::TIME_UNIT: return "nanosecond";
- case MetaAttribute::SEMANTIC_TYPE: return "";
- }
-
- return "";
- }
-
  static int namespaceNameHeaderSize()
  {
  return 1;
@@ -413,6 +413,18 @@ class FrameCodec
  return length;
  }
 
+ static const char *semanticVersionMetaAttribute(const MetaAttribute::Attribute metaAttribute)
+ {
+ switch (metaAttribute)
+ {
+ case MetaAttribute::EPOCH: return "unix";
+ case MetaAttribute::TIME_UNIT: return "nanosecond";
+ case MetaAttribute::SEMANTIC_TYPE: return "";
+ }
+
+ return "";
+ }
+
  static const char *semanticVersionCharacterEncoding()
  {
  return "UTF-8";
@@ -434,18 +446,6 @@ class FrameCodec
  }
 
 
- static const char *semanticVersionMetaAttribute(const MetaAttribute::Attribute metaAttribute)
- {
- switch (metaAttribute)
- {
- case MetaAttribute::EPOCH: return "unix";
- case MetaAttribute::TIME_UNIT: return "nanosecond";
- case MetaAttribute::SEMANTIC_TYPE: return "";
- }
-
- return "";
- }
-
  static int semanticVersionHeaderSize()
  {
  return 1;

main/cpp/uk_co_real_logic_sbe_ir_generated/PresenceCodec.hpp

@@ -16,19 +16,19 @@ class PresenceCodec
 
  enum Value 
  {
- REQUIRED = (sbe_uint8_t)0,
- OPTIONAL = (sbe_uint8_t)1,
- CONSTANT = (sbe_uint8_t)2,
+ SBE_REQUIRED = (sbe_uint8_t)0,
+ SBE_OPTIONAL = (sbe_uint8_t)1,
+ SBE_CONSTANT = (sbe_uint8_t)2,
  NULL_VALUE = (sbe_uint8_t)255
  };
 
  static PresenceCodec::Value get(const sbe_uint8_t value)
  {
  switch (value)
  {
- case 0: return REQUIRED;
- case 1: return OPTIONAL;
- case 2: return CONSTANT;
+ case 0: return SBE_REQUIRED;
+ case 1: return SBE_OPTIONAL;
+ case 2: return SBE_CONSTANT;
  case 255: return NULL_VALUE;
  }