Skip to content

Fix #353 #355 #366 #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 16, 2016
Merged

Fix #353 #355 #366 #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ccff3d
[C++]: constexpr SBE stub getters
didenko Aug 15, 2016
2825b8b
[C++]: regenerate IR stubs
didenko Aug 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sbe-tool/src/main/cpp/uk_co_real_logic_sbe_ir_generated/ByteOrderCodec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
#endif

#if __cplusplus >= 201103L
# define SBE_CONST_KIND constexpr
# define SBE_CONSTEXPR constexpr
#else
# define SBE_CONST_KIND const
# define SBE_CONSTEXPR
#endif

#include <sbe/sbe.h>
Expand Down
82 changes: 36 additions & 46 deletions sbe-tool/src/main/cpp/uk_co_real_logic_sbe_ir_generated/FrameCodec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
#endif

#if __cplusplus >= 201103L
# define SBE_CONST_KIND constexpr
# define SBE_CONSTEXPR constexpr
#else
# define SBE_CONST_KIND const
# define SBE_CONSTEXPR
#endif

#include <sbe/sbe.h>
Expand Down Expand Up @@ -107,34 +107,29 @@ class FrameCodec
return *this;
}

static SBE_CONST_KIND std::uint16_t SbeBlockLength{(std::uint16_t)12};
static const std::uint16_t sbeBlockLength(void)
static SBE_CONSTEXPR const std::uint16_t sbeBlockLength(void)
{
return SbeBlockLength;
return (std::uint16_t)12;
}

static SBE_CONST_KIND std::uint16_t SbeTemplateId{(std::uint16_t)1};
static const std::uint16_t sbeTemplateId(void)
static SBE_CONSTEXPR const std::uint16_t sbeTemplateId(void)
{
return SbeTemplateId;
return (std::uint16_t)1;
}

static SBE_CONST_KIND std::uint16_t SbeSchemaId{(std::uint16_t)1};
static const std::uint16_t sbeSchemaId(void)
static SBE_CONSTEXPR const std::uint16_t sbeSchemaId(void)
{
return SbeSchemaId;
return (std::uint16_t)1;
}

static SBE_CONST_KIND std::uint16_t SbeSchemaVersion{(std::uint16_t)0};
static const std::uint16_t sbeSchemaVersion(void)
static SBE_CONSTEXPR const std::uint16_t sbeSchemaVersion(void)
{
return SbeSchemaVersion;
return (std::uint16_t)0;
}

static SBE_CONST_KIND char SbeSemanticType[] = "";
static const char *sbeSemanticType(void)
static SBE_CONSTEXPR const char * sbeSemanticType(void)
{
return SbeSemanticType;
return "";
}

std::uint64_t offset(void) const
Expand Down Expand Up @@ -185,12 +180,12 @@ class FrameCodec
return m_actingVersion;
}

static const std::uint16_t irIdId(void)
static SBE_CONSTEXPR const std::uint16_t irIdId(void)
{
return 1;
}

static const std::uint64_t irIdSinceVersion(void)
static SBE_CONSTEXPR const std::uint64_t irIdSinceVersion(void)
{
return 0;
}
Expand All @@ -213,17 +208,17 @@ class FrameCodec
return "";
}

static const std::int32_t irIdNullValue()
static SBE_CONSTEXPR const std::int32_t irIdNullValue()
{
return SBE_NULLVALUE_INT32;
}

static const std::int32_t irIdMinValue()
static SBE_CONSTEXPR const std::int32_t irIdMinValue()
{
return -2147483647;
}

static const std::int32_t irIdMaxValue()
static SBE_CONSTEXPR const std::int32_t irIdMaxValue()
{
return 2147483647;
}
Expand All @@ -239,12 +234,12 @@ class FrameCodec
return *this;
}

static const std::uint16_t irVersionId(void)
static SBE_CONSTEXPR const std::uint16_t irVersionId(void)
{
return 2;
}

static const std::uint64_t irVersionSinceVersion(void)
static SBE_CONSTEXPR const std::uint64_t irVersionSinceVersion(void)
{
return 0;
}
Expand All @@ -267,17 +262,17 @@ class FrameCodec
return "";
}

static const std::int32_t irVersionNullValue()
static SBE_CONSTEXPR const std::int32_t irVersionNullValue()
{
return SBE_NULLVALUE_INT32;
}

static const std::int32_t irVersionMinValue()
static SBE_CONSTEXPR const std::int32_t irVersionMinValue()
{
return -2147483647;
}

static const std::int32_t irVersionMaxValue()
static SBE_CONSTEXPR const std::int32_t irVersionMaxValue()
{
return 2147483647;
}
Expand All @@ -293,12 +288,12 @@ class FrameCodec
return *this;
}

static const std::uint16_t schemaVersionId(void)
static SBE_CONSTEXPR const std::uint16_t schemaVersionId(void)
{
return 3;
}

static const std::uint64_t schemaVersionSinceVersion(void)
static SBE_CONSTEXPR const std::uint64_t schemaVersionSinceVersion(void)
{
return 0;
}
Expand All @@ -321,17 +316,17 @@ class FrameCodec
return "";
}

static const std::int32_t schemaVersionNullValue()
static SBE_CONSTEXPR const std::int32_t schemaVersionNullValue()
{
return SBE_NULLVALUE_INT32;
}

static const std::int32_t schemaVersionMinValue()
static SBE_CONSTEXPR const std::int32_t schemaVersionMinValue()
{
return -2147483647;
}

static const std::int32_t schemaVersionMaxValue()
static SBE_CONSTEXPR const std::int32_t schemaVersionMaxValue()
{
return 2147483647;
}
Expand Down Expand Up @@ -364,7 +359,7 @@ class FrameCodec
return "UTF-8";
}

static const std::uint64_t packageNameSinceVersion(void)
static SBE_CONSTEXPR const std::uint64_t packageNameSinceVersion(void)
{
return 0;
}
Expand All @@ -374,13 +369,13 @@ class FrameCodec
return (m_actingVersion >= packageNameSinceVersion()) ? true : false;
}

static const std::uint16_t packageNameId(void)
static SBE_CONSTEXPR const std::uint16_t packageNameId(void)
{
return 4;
}


static const std::uint64_t packageNameHeaderLength()
static SBE_CONSTEXPR const std::uint64_t packageNameHeaderLength()
{
return 2;
}
Expand Down Expand Up @@ -467,7 +462,7 @@ class FrameCodec
return "UTF-8";
}

static const std::uint64_t namespaceNameSinceVersion(void)
static SBE_CONSTEXPR const std::uint64_t namespaceNameSinceVersion(void)
{
return 0;
}
Expand All @@ -477,13 +472,13 @@ class FrameCodec
return (m_actingVersion >= namespaceNameSinceVersion()) ? true : false;
}

static const std::uint16_t namespaceNameId(void)
static SBE_CONSTEXPR const std::uint16_t namespaceNameId(void)
{
return 5;
}


static const std::uint64_t namespaceNameHeaderLength()
static SBE_CONSTEXPR const std::uint64_t namespaceNameHeaderLength()
{
return 2;
}
Expand Down Expand Up @@ -570,7 +565,7 @@ class FrameCodec
return "UTF-8";
}

static const std::uint64_t semanticVersionSinceVersion(void)
static SBE_CONSTEXPR const std::uint64_t semanticVersionSinceVersion(void)
{
return 0;
}
Expand All @@ -580,13 +575,13 @@ class FrameCodec
return (m_actingVersion >= semanticVersionSinceVersion()) ? true : false;
}

static const std::uint16_t semanticVersionId(void)
static SBE_CONSTEXPR const std::uint16_t semanticVersionId(void)
{
return 6;
}


static const std::uint64_t semanticVersionHeaderLength()
static SBE_CONSTEXPR const std::uint64_t semanticVersionHeaderLength()
{
return 2;
}
Expand Down Expand Up @@ -656,11 +651,6 @@ class FrameCodec
return *this;
}
};
SBE_CONST_KIND std::uint16_t FrameCodec::SbeBlockLength;
SBE_CONST_KIND std::uint16_t FrameCodec::SbeTemplateId;
SBE_CONST_KIND std::uint16_t FrameCodec::SbeSchemaId;
SBE_CONST_KIND std::uint16_t FrameCodec::SbeSchemaVersion;
SBE_CONST_KIND char FrameCodec::SbeSemanticType[];
};
};
};
Expand Down
30 changes: 15 additions & 15 deletions sbe-tool/src/main/cpp/uk_co_real_logic_sbe_ir_generated/MessageHeader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
#endif

#if __cplusplus >= 201103L
# define SBE_CONST_KIND constexpr
# define SBE_CONSTEXPR constexpr
#else
# define SBE_CONST_KIND const
# define SBE_CONSTEXPR
#endif

#include <sbe/sbe.h>
Expand Down Expand Up @@ -99,23 +99,23 @@ class MessageHeader
return *this;
}

static const std::uint64_t encodedLength(void)
static SBE_CONSTEXPR const std::uint64_t encodedLength(void)
{
return 8;
}


static const std::uint16_t blockLengthNullValue()
static SBE_CONSTEXPR const std::uint16_t blockLengthNullValue()
{
return SBE_NULLVALUE_UINT16;
}

static const std::uint16_t blockLengthMinValue()
static SBE_CONSTEXPR const std::uint16_t blockLengthMinValue()
{
return (std::uint16_t)0;
}

static const std::uint16_t blockLengthMaxValue()
static SBE_CONSTEXPR const std::uint16_t blockLengthMaxValue()
{
return (std::uint16_t)65534;
}
Expand All @@ -131,17 +131,17 @@ class MessageHeader
return *this;
}

static const std::uint16_t templateIdNullValue()
static SBE_CONSTEXPR const std::uint16_t templateIdNullValue()
{
return SBE_NULLVALUE_UINT16;
}

static const std::uint16_t templateIdMinValue()
static SBE_CONSTEXPR const std::uint16_t templateIdMinValue()
{
return (std::uint16_t)0;
}

static const std::uint16_t templateIdMaxValue()
static SBE_CONSTEXPR const std::uint16_t templateIdMaxValue()
{
return (std::uint16_t)65534;
}
Expand All @@ -157,17 +157,17 @@ class MessageHeader
return *this;
}

static const std::uint16_t schemaIdNullValue()
static SBE_CONSTEXPR const std::uint16_t schemaIdNullValue()
{
return SBE_NULLVALUE_UINT16;
}

static const std::uint16_t schemaIdMinValue()
static SBE_CONSTEXPR const std::uint16_t schemaIdMinValue()
{
return (std::uint16_t)0;
}

static const std::uint16_t schemaIdMaxValue()
static SBE_CONSTEXPR const std::uint16_t schemaIdMaxValue()
{
return (std::uint16_t)65534;
}
Expand All @@ -183,17 +183,17 @@ class MessageHeader
return *this;
}

static const std::uint16_t versionNullValue()
static SBE_CONSTEXPR const std::uint16_t versionNullValue()
{
return SBE_NULLVALUE_UINT16;
}

static const std::uint16_t versionMinValue()
static SBE_CONSTEXPR const std::uint16_t versionMinValue()
{
return (std::uint16_t)0;
}

static const std::uint16_t versionMaxValue()
static SBE_CONSTEXPR const std::uint16_t versionMaxValue()
{
return (std::uint16_t)65534;
}
Expand Down
4 changes: 2 additions & 2 deletions sbe-tool/src/main/cpp/uk_co_real_logic_sbe_ir_generated/PresenceCodec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
#endif

#if __cplusplus >= 201103L
# define SBE_CONST_KIND constexpr
# define SBE_CONSTEXPR constexpr
#else
# define SBE_CONST_KIND const
# define SBE_CONSTEXPR
#endif

#include <sbe/sbe.h>
Expand Down
4 changes: 2 additions & 2 deletions sbe-tool/src/main/cpp/uk_co_real_logic_sbe_ir_generated/PrimitiveTypeCodec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
#endif

#if __cplusplus >= 201103L
# define SBE_CONST_KIND constexpr
# define SBE_CONSTEXPR constexpr
#else
# define SBE_CONST_KIND const
# define SBE_CONSTEXPR
#endif

#include <sbe/sbe.h>
Expand Down
Loading