From d05030487344708d304aec8ccd25f9d94f0abb49 Mon Sep 17 00:00:00 2001 From: Eric Marti Date: Tue, 6 Mar 2018 18:59:24 -0500 Subject: [PATCH] [C++] Removed using namespace sbe from code-generated headers --- .../sbe/generation/cpp/CppGenerator.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java index 79361298f1..e3d228db3a 100755 --- a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java +++ b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java @@ -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"); @@ -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" + @@ -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" + @@ -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",