Skip to content

Commit 1e7a70e

Browse files
mjpt777mjpt777
committed
[C++] Rename position methods to sbePosition to avoid name clashes in generated codecs.
1 parent 5561dc4 commit 1e7a70e

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,11 @@ private static void generateGroupClassHeader(
259259
indent + " {\n" +
260260
indent + " return %2$d;\n" +
261261
indent + " }\n\n" +
262-
indent + " std::uint64_t position() const\n" +
262+
indent + " std::uint64_t sbePosition() const\n" +
263263
indent + " {\n" +
264264
indent + " return *m_positionPtr;\n" +
265265
indent + " }\n\n" +
266-
indent + " void position(const std::uint64_t position)\n" +
266+
indent + " void sbePosition(const std::uint64_t position)\n" +
267267
indent + " {\n" +
268268
indent + " if (SBE_BOUNDS_CHECK_EXPECT((position > m_bufferLength), false))\n" +
269269
indent + " {\n" +
@@ -407,9 +407,9 @@ private CharSequence generateVarData(final String className, final List<Token> t
407407
indent + " {\n" +
408408
"%2$s" +
409409
indent + " %4$s lengthFieldValue;\n" +
410-
indent + " std::memcpy(&lengthFieldValue, m_buffer + position(), sizeof(%4$s));\n" +
411-
indent + " const char *fieldPtr = (m_buffer + position() + %3$d);\n" +
412-
indent + " position(position() + %3$d + %5$s(lengthFieldValue));\n" +
410+
indent + " std::memcpy(&lengthFieldValue, m_buffer + sbePosition(), sizeof(%4$s));\n" +
411+
indent + " const char *fieldPtr = (m_buffer + sbePosition() + %3$d);\n" +
412+
indent + " sbePosition(sbePosition() + %3$d + %5$s(lengthFieldValue));\n" +
413413
indent + " return fieldPtr;\n" +
414414
indent + " }\n",
415415
formatPropertyName(propertyName),
@@ -423,14 +423,14 @@ private CharSequence generateVarData(final String className, final List<Token> t
423423
indent + " {\n" +
424424
"%2$s" +
425425
indent + " std::uint64_t lengthOfLengthField = %3$d;\n" +
426-
indent + " std::uint64_t lengthPosition = position();\n" +
427-
indent + " position(lengthPosition + lengthOfLengthField);\n" +
426+
indent + " std::uint64_t lengthPosition = sbePosition();\n" +
427+
indent + " sbePosition(lengthPosition + lengthOfLengthField);\n" +
428428
indent + " %5$s lengthFieldValue;\n" +
429429
indent + " std::memcpy(&lengthFieldValue, m_buffer + lengthPosition, sizeof(%5$s));\n" +
430430
indent + " std::uint64_t dataLength = %4$s(lengthFieldValue);\n" +
431431
indent + " std::uint64_t bytesToCopy = (length < dataLength) ? length : dataLength;\n" +
432-
indent + " std::uint64_t pos = position();\n" +
433-
indent + " position(position() + dataLength);\n" +
432+
indent + " std::uint64_t pos = sbePosition();\n" +
433+
indent + " sbePosition(sbePosition() + dataLength);\n" +
434434
indent + " std::memcpy(dst, m_buffer + pos, bytesToCopy);\n" +
435435
indent + " return bytesToCopy;\n" +
436436
indent + " }\n",
@@ -444,12 +444,12 @@ private CharSequence generateVarData(final String className, final List<Token> t
444444
indent + " %5$s &put%1$s(const char *src, const %3$s length)\n" +
445445
indent + " {\n" +
446446
indent + " std::uint64_t lengthOfLengthField = %2$d;\n" +
447-
indent + " std::uint64_t lengthPosition = position();\n" +
447+
indent + " std::uint64_t lengthPosition = sbePosition();\n" +
448448
indent + " %3$s lengthFieldValue = %4$s(length);\n" +
449-
indent + " position(lengthPosition + lengthOfLengthField);\n" +
449+
indent + " sbePosition(lengthPosition + lengthOfLengthField);\n" +
450450
indent + " std::memcpy(m_buffer + lengthPosition, &lengthFieldValue, sizeof(%3$s));\n" +
451-
indent + " std::uint64_t pos = position();\n" +
452-
indent + " position(position() + length);\n" +
451+
indent + " std::uint64_t pos = sbePosition();\n" +
452+
indent + " sbePosition(sbePosition() + length);\n" +
453453
indent + " std::memcpy(m_buffer + pos, src, length);\n" +
454454
indent + " return *this;\n" +
455455
indent + " }\n",
@@ -464,14 +464,14 @@ private CharSequence generateVarData(final String className, final List<Token> t
464464
indent + " {\n" +
465465
"%2$s" +
466466
indent + " std::uint64_t lengthOfLengthField = %3$d;\n" +
467-
indent + " std::uint64_t lengthPosition = position();\n" +
468-
indent + " position(lengthPosition + lengthOfLengthField);\n" +
467+
indent + " std::uint64_t lengthPosition = sbePosition();\n" +
468+
indent + " sbePosition(lengthPosition + lengthOfLengthField);\n" +
469469
indent + " %5$s lengthFieldValue;\n" +
470470
indent + " std::memcpy(&lengthFieldValue, m_buffer + lengthPosition, sizeof(%5$s));\n" +
471471
indent + " std::uint64_t dataLength = %4$s(lengthFieldValue);\n" +
472-
indent + " std::uint64_t pos = position();\n" +
472+
indent + " std::uint64_t pos = sbePosition();\n" +
473473
indent + " const std::string result(m_buffer + pos, dataLength);\n" +
474-
indent + " position(position() + dataLength);\n" +
474+
indent + " sbePosition(sbePosition() + dataLength);\n" +
475475
indent + " return result;\n" +
476476
indent + " }\n",
477477
propertyName,
@@ -488,12 +488,12 @@ private CharSequence generateVarData(final String className, final List<Token> t
488488
indent + " throw std::runtime_error(\"std::string too long for length type [E109]\");\n" +
489489
indent + " }\n" +
490490
indent + " std::uint64_t lengthOfLengthField = %3$d;\n" +
491-
indent + " std::uint64_t lengthPosition = position();\n" +
491+
indent + " std::uint64_t lengthPosition = sbePosition();\n" +
492492
indent + " %4$s lengthFieldValue = %5$s(static_cast<%4$s>(str.length()));\n" +
493-
indent + " position(lengthPosition + lengthOfLengthField);\n" +
493+
indent + " sbePosition(lengthPosition + lengthOfLengthField);\n" +
494494
indent + " std::memcpy(m_buffer + lengthPosition, &lengthFieldValue, sizeof(%4$s));\n" +
495-
indent + " std::uint64_t pos = position();\n" +
496-
indent + " position(position() + str.length());\n" +
495+
indent + " std::uint64_t pos = sbePosition();\n" +
496+
indent + " sbePosition(sbePosition() + str.length());\n" +
497497
indent + " std::memcpy(m_buffer + pos, str.c_str(), str.length());\n" +
498498
indent + " return *this;\n" +
499499
indent + " }\n",
@@ -565,7 +565,7 @@ private void generateVarDataDescriptors(
565565
indent + " {\n" +
566566
"%2$s" +
567567
indent + " %4$s length;\n" +
568-
indent + " std::memcpy(&length, m_buffer + position(), sizeof(%4$s));\n" +
568+
indent + " std::memcpy(&length, m_buffer + sbePosition(), sizeof(%4$s));\n" +
569569
indent + " return %3$s(length);\n" +
570570
indent + " }\n\n",
571571
toLowerFirstChar(propertyName),
@@ -1487,7 +1487,7 @@ private CharSequence generateMessageFlyweightCode(final String className, final
14871487
" m_actingBlockLength = actingBlockLength;\n" +
14881488
" m_actingVersion = actingVersion;\n" +
14891489
" m_positionPtr = &m_position;\n" +
1490-
" position(offset + m_actingBlockLength);\n" +
1490+
" sbePosition(offset + m_actingBlockLength);\n" +
14911491
" }\n\n" +
14921492
" inline void reset(const %10$s& codec)\n" +
14931493
" {\n" +
@@ -1537,11 +1537,11 @@ private CharSequence generateMessageFlyweightCode(final String className, final
15371537
" reset(buffer, offset, bufferLength, actingBlockLength, actingVersion);\n" +
15381538
" return *this;\n" +
15391539
" }\n\n" +
1540-
" std::uint64_t position() const SBE_NOEXCEPT\n" +
1540+
" std::uint64_t sbePosition() const SBE_NOEXCEPT\n" +
15411541
" {\n" +
15421542
" return m_position;\n" +
15431543
" }\n\n" +
1544-
" void position(const std::uint64_t position)\n" +
1544+
" void sbePosition(const std::uint64_t position)\n" +
15451545
" {\n" +
15461546
" if (SBE_BOUNDS_CHECK_EXPECT((position > m_bufferLength), false))\n" +
15471547
" {\n" +
@@ -1551,7 +1551,7 @@ private CharSequence generateMessageFlyweightCode(final String className, final
15511551
" }\n\n" +
15521552
" std::uint64_t encodedLength() const SBE_NOEXCEPT\n" +
15531553
" {\n" +
1554-
" return position() - m_offset;\n" +
1554+
" return sbePosition() - m_offset;\n" +
15551555
" }\n\n" +
15561556
" char *buffer() SBE_NOEXCEPT\n" +
15571557
" {\n" +

0 commit comments

Comments
 (0)