Skip to content

Commit 755c31b

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 95f86b7 + 0226d7c commit 755c31b

File tree

19 files changed

+455
-38
lines changed

19 files changed

+455
-38
lines changed

sbe-tool/src/main/cpp/uk_co_real_logic_sbe_ir_generated/ByteOrderCodec.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,22 @@
2121
# include <cstring>
2222
#endif
2323

24+
#if __cplusplus >= 201103L
25+
# define SBE_CONST_KIND constexpr
26+
#else
27+
# define SBE_CONST_KIND const
28+
#endif
29+
2430
#include <sbe/sbe.h>
2531

2632
using namespace sbe;
2733

28-
namespace uk_co_real_logic_sbe_ir_generated {
34+
namespace uk {
35+
namespace co {
36+
namespace real_logic {
37+
namespace sbe {
38+
namespace ir {
39+
namespace generated {
2940

3041
class ByteOrderCodec
3142
{
@@ -50,5 +61,10 @@ class ByteOrderCodec
5061
throw std::runtime_error("unknown value for enum ByteOrderCodec [E103]");
5162
}
5263
};
64+
};
65+
};
66+
};
67+
};
68+
};
5369
}
5470
#endif

sbe-tool/src/main/cpp/uk_co_real_logic_sbe_ir_generated/FrameCodec.h

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121
# include <cstring>
2222
#endif
2323

24+
#if __cplusplus >= 201103L
25+
# define SBE_CONST_KIND constexpr
26+
#else
27+
# define SBE_CONST_KIND const
28+
#endif
29+
2430
#include <sbe/sbe.h>
2531

2632
#include "ByteOrderCodec.h"
@@ -31,7 +37,12 @@
3137

3238
using namespace sbe;
3339

34-
namespace uk_co_real_logic_sbe_ir_generated {
40+
namespace uk {
41+
namespace co {
42+
namespace real_logic {
43+
namespace sbe {
44+
namespace ir {
45+
namespace generated {
3546

3647
class FrameCodec
3748
{
@@ -96,29 +107,34 @@ class FrameCodec
96107
return *this;
97108
}
98109

110+
static SBE_CONST_KIND std::uint16_t SbeBlockLength{(std::uint16_t)12};
99111
static const std::uint16_t sbeBlockLength(void)
100112
{
101-
return (std::uint16_t)12;
113+
return SbeBlockLength;
102114
}
103115

116+
static SBE_CONST_KIND std::uint16_t SbeTemplateId{(std::uint16_t)1};
104117
static const std::uint16_t sbeTemplateId(void)
105118
{
106-
return (std::uint16_t)1;
119+
return SbeTemplateId;
107120
}
108121

122+
static SBE_CONST_KIND std::uint16_t SbeSchemaId{(std::uint16_t)1};
109123
static const std::uint16_t sbeSchemaId(void)
110124
{
111-
return (std::uint16_t)1;
125+
return SbeSchemaId;
112126
}
113127

128+
static SBE_CONST_KIND std::uint16_t SbeSchemaVersion{(std::uint16_t)0};
114129
static const std::uint16_t sbeSchemaVersion(void)
115130
{
116-
return (std::uint16_t)0;
131+
return SbeSchemaVersion;
117132
}
118133

134+
static SBE_CONST_KIND char SbeSemanticType[] = "";
119135
static const char *sbeSemanticType(void)
120136
{
121-
return "";
137+
return SbeSemanticType;
122138
}
123139

124140
std::uint64_t offset(void) const
@@ -640,5 +656,15 @@ class FrameCodec
640656
return *this;
641657
}
642658
};
643-
}
659+
SBE_CONST_KIND std::uint16_t FrameCodec::SbeBlockLength;
660+
SBE_CONST_KIND std::uint16_t FrameCodec::SbeTemplateId;
661+
SBE_CONST_KIND std::uint16_t FrameCodec::SbeSchemaId;
662+
SBE_CONST_KIND std::uint16_t FrameCodec::SbeSchemaVersion;
663+
SBE_CONST_KIND char FrameCodec::SbeSemanticType[];
664+
};
665+
};
666+
};
667+
};
668+
};
669+
};
644670
#endif

sbe-tool/src/main/cpp/uk_co_real_logic_sbe_ir_generated/MessageHeader.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,22 @@
2121
# include <cstring>
2222
#endif
2323

24+
#if __cplusplus >= 201103L
25+
# define SBE_CONST_KIND constexpr
26+
#else
27+
# define SBE_CONST_KIND const
28+
#endif
29+
2430
#include <sbe/sbe.h>
2531

2632
using namespace sbe;
2733

28-
namespace uk_co_real_logic_sbe_ir_generated {
34+
namespace uk {
35+
namespace co {
36+
namespace real_logic {
37+
namespace sbe {
38+
namespace ir {
39+
namespace generated {
2940

3041
class MessageHeader
3142
{
@@ -198,5 +209,10 @@ class MessageHeader
198209
return *this;
199210
}
200211
};
212+
};
213+
};
214+
};
215+
};
216+
};
201217
}
202218
#endif

sbe-tool/src/main/cpp/uk_co_real_logic_sbe_ir_generated/PresenceCodec.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,22 @@
2121
# include <cstring>
2222
#endif
2323

24+
#if __cplusplus >= 201103L
25+
# define SBE_CONST_KIND constexpr
26+
#else
27+
# define SBE_CONST_KIND const
28+
#endif
29+
2430
#include <sbe/sbe.h>
2531

2632
using namespace sbe;
2733

28-
namespace uk_co_real_logic_sbe_ir_generated {
34+
namespace uk {
35+
namespace co {
36+
namespace real_logic {
37+
namespace sbe {
38+
namespace ir {
39+
namespace generated {
2940

3041
class PresenceCodec
3142
{
@@ -52,5 +63,10 @@ class PresenceCodec
5263
throw std::runtime_error("unknown value for enum PresenceCodec [E103]");
5364
}
5465
};
66+
};
67+
};
68+
};
69+
};
70+
};
5571
}
5672
#endif

sbe-tool/src/main/cpp/uk_co_real_logic_sbe_ir_generated/PrimitiveTypeCodec.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,22 @@
2121
# include <cstring>
2222
#endif
2323

24+
#if __cplusplus >= 201103L
25+
# define SBE_CONST_KIND constexpr
26+
#else
27+
# define SBE_CONST_KIND const
28+
#endif
29+
2430
#include <sbe/sbe.h>
2531

2632
using namespace sbe;
2733

28-
namespace uk_co_real_logic_sbe_ir_generated {
34+
namespace uk {
35+
namespace co {
36+
namespace real_logic {
37+
namespace sbe {
38+
namespace ir {
39+
namespace generated {
2940

3041
class PrimitiveTypeCodec
3142
{
@@ -70,5 +81,10 @@ class PrimitiveTypeCodec
7081
throw std::runtime_error("unknown value for enum PrimitiveTypeCodec [E103]");
7182
}
7283
};
84+
};
85+
};
86+
};
87+
};
88+
};
7389
}
7490
#endif

sbe-tool/src/main/cpp/uk_co_real_logic_sbe_ir_generated/SignalCodec.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,22 @@
2121
# include <cstring>
2222
#endif
2323

24+
#if __cplusplus >= 201103L
25+
# define SBE_CONST_KIND constexpr
26+
#else
27+
# define SBE_CONST_KIND const
28+
#endif
29+
2430
#include <sbe/sbe.h>
2531

2632
using namespace sbe;
2733

28-
namespace uk_co_real_logic_sbe_ir_generated {
34+
namespace uk {
35+
namespace co {
36+
namespace real_logic {
37+
namespace sbe {
38+
namespace ir {
39+
namespace generated {
2940

3041
class SignalCodec
3142
{
@@ -80,5 +91,10 @@ class SignalCodec
8091
throw std::runtime_error("unknown value for enum SignalCodec [E103]");
8192
}
8293
};
94+
};
95+
};
96+
};
97+
};
98+
};
8399
}
84100
#endif

sbe-tool/src/main/cpp/uk_co_real_logic_sbe_ir_generated/TokenCodec.h

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121
# include <cstring>
2222
#endif
2323

24+
#if __cplusplus >= 201103L
25+
# define SBE_CONST_KIND constexpr
26+
#else
27+
# define SBE_CONST_KIND const
28+
#endif
29+
2430
#include <sbe/sbe.h>
2531

2632
#include "ByteOrderCodec.h"
@@ -31,7 +37,12 @@
3137

3238
using namespace sbe;
3339

34-
namespace uk_co_real_logic_sbe_ir_generated {
40+
namespace uk {
41+
namespace co {
42+
namespace real_logic {
43+
namespace sbe {
44+
namespace ir {
45+
namespace generated {
3546

3647
class TokenCodec
3748
{
@@ -96,29 +107,34 @@ class TokenCodec
96107
return *this;
97108
}
98109

110+
static SBE_CONST_KIND std::uint16_t SbeBlockLength{(std::uint16_t)24};
99111
static const std::uint16_t sbeBlockLength(void)
100112
{
101-
return (std::uint16_t)24;
113+
return SbeBlockLength;
102114
}
103115

116+
static SBE_CONST_KIND std::uint16_t SbeTemplateId{(std::uint16_t)2};
104117
static const std::uint16_t sbeTemplateId(void)
105118
{
106-
return (std::uint16_t)2;
119+
return SbeTemplateId;
107120
}
108121

122+
static SBE_CONST_KIND std::uint16_t SbeSchemaId{(std::uint16_t)1};
109123
static const std::uint16_t sbeSchemaId(void)
110124
{
111-
return (std::uint16_t)1;
125+
return SbeSchemaId;
112126
}
113127

128+
static SBE_CONST_KIND std::uint16_t SbeSchemaVersion{(std::uint16_t)0};
114129
static const std::uint16_t sbeSchemaVersion(void)
115130
{
116-
return (std::uint16_t)0;
131+
return SbeSchemaVersion;
117132
}
118133

134+
static SBE_CONST_KIND char SbeSemanticType[] = "";
119135
static const char *sbeSemanticType(void)
120136
{
121-
return "";
137+
return SbeSemanticType;
122138
}
123139

124140
std::uint64_t offset(void) const
@@ -1625,5 +1641,15 @@ class TokenCodec
16251641
return *this;
16261642
}
16271643
};
1628-
}
1644+
SBE_CONST_KIND std::uint16_t TokenCodec::SbeBlockLength;
1645+
SBE_CONST_KIND std::uint16_t TokenCodec::SbeTemplateId;
1646+
SBE_CONST_KIND std::uint16_t TokenCodec::SbeSchemaId;
1647+
SBE_CONST_KIND std::uint16_t TokenCodec::SbeSchemaVersion;
1648+
SBE_CONST_KIND char TokenCodec::SbeSemanticType[];
1649+
};
1650+
};
1651+
};
1652+
};
1653+
};
1654+
};
16291655
#endif

sbe-tool/src/main/cpp/uk_co_real_logic_sbe_ir_generated/VarDataEncoding.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,23 @@
2121
# include <cstring>
2222
#endif
2323

24+
#if __cplusplus >= 201103L
25+
# define SBE_CONST_KIND constexpr
26+
#else
27+
# define SBE_CONST_KIND const
28+
#endif
29+
2430
#include <sbe/sbe.h>
2531

2632

2733
using namespace sbe;
2834

29-
namespace uk_co_real_logic_sbe_ir_generated {
35+
namespace uk {
36+
namespace co {
37+
namespace real_logic {
38+
namespace sbe {
39+
namespace ir {
40+
namespace generated {
3041

3142
class VarDataEncoding
3243
{
@@ -136,5 +147,10 @@ class VarDataEncoding
136147
return (std::uint8_t)254;
137148
}
138149
};
150+
};
151+
};
152+
};
153+
};
154+
};
139155
}
140156
#endif

0 commit comments

Comments
 (0)