Skip to content

Commit dbf6165

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 6869751 + 51431b0 commit dbf6165

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,7 +1279,7 @@ private CharSequence generateSingleValueProperty(
12791279
final StringBuilder sb = new StringBuilder();
12801280

12811281
sb.append(String.format("\n" +
1282-
indent + " SBE_NODISCARD %1$s %2$s() const\n" +
1282+
indent + " SBE_NODISCARD %1$s %2$s() const SBE_NOEXCEPT\n" +
12831283
indent + " {\n" +
12841284
"%3$s" +
12851285
"%4$s" +
@@ -1293,7 +1293,7 @@ private CharSequence generateSingleValueProperty(
12931293
primitiveType, "", Integer.toString(offset), token.encoding().byteOrder(), indent);
12941294

12951295
sb.append(String.format("\n" +
1296-
indent + " %1$s &%2$s(const %3$s value)\n" +
1296+
indent + " %1$s &%2$s(const %3$s value) SBE_NOEXCEPT\n" +
12971297
indent + " {\n" +
12981298
"%4$s" +
12991299
indent + " return *this;\n" +
@@ -2101,7 +2101,7 @@ private CharSequence generateEnumProperty(
21012101
else
21022102
{
21032103
sb.append(String.format("\n" +
2104-
indent + " SBE_NODISCARD %1$s::Value %2$s() const\n" +
2104+
indent + " SBE_NODISCARD %1$s::Value %2$s() const SBE_NOEXCEPT\n" +
21052105
indent + " {\n" +
21062106
"%3$s" +
21072107
indent + " %5$s val;\n" +
@@ -2116,7 +2116,7 @@ private CharSequence generateEnumProperty(
21162116
offset));
21172117

21182118
sb.append(String.format("\n" +
2119-
indent + " %1$s &%2$s(const %3$s::Value value)\n" +
2119+
indent + " %1$s &%2$s(const %3$s::Value value) SBE_NOEXCEPT\n" +
21202120
indent + " {\n" +
21212121
indent + " %4$s val = %6$s(value);\n" +
21222122
indent + " std::memcpy(m_buffer + m_offset + %5$d, &val, sizeof(%4$s));\n" +

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.13.2-SNAPSHOT
1+
1.13.3-SNAPSHOT

0 commit comments

Comments
 (0)