Skip to content

Commit 700354c

Browse files
committed
[C++]: renamed Ir::TokenPresence enums to avoid windefs.h header include define conflict
1 parent d406792 commit 700354c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

examples/cpp98/SbeOtfDecoder.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,15 +244,15 @@ class CarCallbacks : public OnNext, public OnError, public OnCompleted
244244
{
245245
switch (presence)
246246
{
247-
case Ir::REQUIRED:
247+
case Ir::SBE_REQUIRED:
248248
return "REQUIRED";
249249
break;
250250

251-
case Ir::OPTIONAL:
251+
case Ir::SBE_OPTIONAL:
252252
return "OPTIONAL";
253253
break;
254254

255-
case Ir::CONSTANT:
255+
case Ir::SBE_CONSTANT:
256256
return "CONSTANT";
257257
break;
258258

main/cpp/otf_api/Ir.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ class Ir
116116
enum TokenPresence
117117
{
118118
/// Field or encoding presence is required
119-
REQUIRED = 0,
119+
SBE_REQUIRED = 0,
120120
/// Field or encoding presence is optional
121-
OPTIONAL = 1,
121+
SBE_OPTIONAL = 1,
122122
/// Field or encoding presence is constant and not encoded
123-
CONSTANT = 2
123+
SBE_CONSTANT = 2
124124
};
125125

126126
/**

0 commit comments

Comments
 (0)