Skip to content

Commit 07c73d7

Browse files
committed
Merge pull request aeron-io#262 from lcs777/master
Adding namespace to include guard in order to avoid name collisions.
2 parents ccab8e8 + 0cb0989 commit 07c73d7

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

main/java/uk/co/real_logic/sbe/generation/cpp98/Cpp98Generator.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,8 +695,8 @@ private CharSequence generateFileHeader(final String namespaceName, final String
695695
sb.append("/* Generated SBE (Simple Binary Encoding) message codec */\n");
696696

697697
sb.append(String.format(
698-
"#ifndef _%1$s_HPP_\n" +
699-
"#define _%1$s_HPP_\n\n" +
698+
"#ifndef _%1$s_%2$s_HPP_\n" +
699+
"#define _%1$s_%2$s_HPP_\n\n" +
700700
"#if defined(SBE_HAVE_CMATH)\n" +
701701
"/* cmath needed for std::numeric_limits<double>::quiet_NaN() */\n" +
702702
"# include <cmath>\n" +
@@ -709,6 +709,7 @@ private CharSequence generateFileHeader(final String namespaceName, final String
709709
"# define SBE_DOUBLE_NAN NAN\n" +
710710
"#endif\n\n" +
711711
"#include <sbe/sbe.hpp>\n\n",
712+
namespaceName.toUpperCase(),
712713
className.toUpperCase()
713714
));
714715

0 commit comments

Comments
 (0)