Skip to content

[C++] Removed using namespace sbe from code-generated headers #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2018
Merged

[C++] Removed using namespace sbe from code-generated headers #544

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,6 @@ private static CharSequence generateFileHeader(
sb.append("\n");
}

sb.append("using namespace sbe;\n\n");
sb.append("namespace ");
sb.append(String.join(" {\nnamespace ", namespaces));
sb.append(" {\n\n");
Expand Down Expand Up @@ -1042,7 +1041,7 @@ private CharSequence generateLoadValue(
if (primitiveType == PrimitiveType.FLOAT || primitiveType == PrimitiveType.DOUBLE)
{
final String stackUnion =
(primitiveType == PrimitiveType.FLOAT) ? "sbe_float_as_uint_t" : "sbe_double_as_uint_t";
(primitiveType == PrimitiveType.FLOAT) ? "::sbe::sbe_float_as_uint_t" : "::sbe::sbe_double_as_uint_t";

sb.append(String.format(
indent + " %1$s val;\n" +
Expand Down Expand Up @@ -1082,7 +1081,7 @@ private CharSequence generateStoreValue(
if (primitiveType == PrimitiveType.FLOAT || primitiveType == PrimitiveType.DOUBLE)
{
final String stackUnion =
(primitiveType == PrimitiveType.FLOAT) ? "sbe_float_as_uint_t" : "sbe_double_as_uint_t";
(primitiveType == PrimitiveType.FLOAT) ? "::sbe::sbe_float_as_uint_t" : "::sbe::sbe_double_as_uint_t";

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

sb.append(String.format("\n" +
indent + " static const char *%sMetaAttribute(const MetaAttribute::Attribute metaAttribute)" +
indent + " static const char *%sMetaAttribute(const ::sbe::MetaAttribute::Attribute metaAttribute)" +
" SBE_NOEXCEPT\n" +
indent + " {\n" +
indent + " switch (metaAttribute)\n" +
indent + " {\n" +
indent + " case MetaAttribute::EPOCH: return \"%s\";\n" +
indent + " case MetaAttribute::TIME_UNIT: return \"%s\";\n" +
indent + " case MetaAttribute::SEMANTIC_TYPE: return \"%s\";\n" +
indent + " case MetaAttribute::PRESENCE: return \"%s\";\n" +
indent + " case ::sbe::MetaAttribute::EPOCH: return \"%s\";\n" +
indent + " case ::sbe::MetaAttribute::TIME_UNIT: return \"%s\";\n" +
indent + " case ::sbe::MetaAttribute::SEMANTIC_TYPE: return \"%s\";\n" +
indent + " case ::sbe::MetaAttribute::PRESENCE: return \"%s\";\n" +
indent + " }\n\n" +
indent + " return \"\";\n" +
indent + " }\n",
Expand Down