Skip to content

Commit 67cd45a

Browse files
authored
Merge pull request #544 from EricJMarti/master
[C++] Removed using namespace sbe from code-generated headers
2 parents 5e2ff82 + d050304 commit 67cd45a

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,6 @@ private static CharSequence generateFileHeader(
889889
sb.append("\n");
890890
}
891891

892-
sb.append("using namespace sbe;\n\n");
893892
sb.append("namespace ");
894893
sb.append(String.join(" {\nnamespace ", namespaces));
895894
sb.append(" {\n\n");
@@ -1042,7 +1041,7 @@ private CharSequence generateLoadValue(
10421041
if (primitiveType == PrimitiveType.FLOAT || primitiveType == PrimitiveType.DOUBLE)
10431042
{
10441043
final String stackUnion =
1045-
(primitiveType == PrimitiveType.FLOAT) ? "sbe_float_as_uint_t" : "sbe_double_as_uint_t";
1044+
(primitiveType == PrimitiveType.FLOAT) ? "::sbe::sbe_float_as_uint_t" : "::sbe::sbe_double_as_uint_t";
10461045

10471046
sb.append(String.format(
10481047
indent + " %1$s val;\n" +
@@ -1082,7 +1081,7 @@ private CharSequence generateStoreValue(
10821081
if (primitiveType == PrimitiveType.FLOAT || primitiveType == PrimitiveType.DOUBLE)
10831082
{
10841083
final String stackUnion =
1085-
(primitiveType == PrimitiveType.FLOAT) ? "sbe_float_as_uint_t" : "sbe_double_as_uint_t";
1084+
(primitiveType == PrimitiveType.FLOAT) ? "::sbe::sbe_float_as_uint_t" : "::sbe::sbe_double_as_uint_t";
10861085

10871086
sb.append(String.format(
10881087
indent + " %1$s val;\n" +
@@ -1662,15 +1661,15 @@ private static void generateFieldMetaAttributeMethod(
16621661
final String semanticType = encoding.semanticType() == null ? "" : encoding.semanticType();
16631662

16641663
sb.append(String.format("\n" +
1665-
indent + " static const char *%sMetaAttribute(const MetaAttribute::Attribute metaAttribute)" +
1664+
indent + " static const char *%sMetaAttribute(const ::sbe::MetaAttribute::Attribute metaAttribute)" +
16661665
" SBE_NOEXCEPT\n" +
16671666
indent + " {\n" +
16681667
indent + " switch (metaAttribute)\n" +
16691668
indent + " {\n" +
1670-
indent + " case MetaAttribute::EPOCH: return \"%s\";\n" +
1671-
indent + " case MetaAttribute::TIME_UNIT: return \"%s\";\n" +
1672-
indent + " case MetaAttribute::SEMANTIC_TYPE: return \"%s\";\n" +
1673-
indent + " case MetaAttribute::PRESENCE: return \"%s\";\n" +
1669+
indent + " case ::sbe::MetaAttribute::EPOCH: return \"%s\";\n" +
1670+
indent + " case ::sbe::MetaAttribute::TIME_UNIT: return \"%s\";\n" +
1671+
indent + " case ::sbe::MetaAttribute::SEMANTIC_TYPE: return \"%s\";\n" +
1672+
indent + " case ::sbe::MetaAttribute::PRESENCE: return \"%s\";\n" +
16741673
indent + " }\n\n" +
16751674
indent + " return \"\";\n" +
16761675
indent + " }\n",

0 commit comments

Comments
 (0)