Skip to content

Remove inefficiencies created by introducing specific C++11 #503

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 5 commits into from
Sep 25, 2017
Merged

Remove inefficiencies created by introducing specific C++11 #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f4302a8
Remove inefficiencies created by introducing specific C++11 functiona…
Aug 25, 2017
49e240e
Add rvalue-reference handling of forEach
Aug 25, 2017
993aa62
Add move constructor and assignment operator for C++11 generated code
Sep 25, 2017
859d2ee
Merge branch 'master' into c++11-fixes
Sep 25, 2017
523ebeb
Remove tabs and change to spaces (stupid default editor settings)
Sep 25, 2017
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
3 changes: 3 additions & 0 deletions sbe-benchmarks/src/main/cpp/SbeCarCodecBench.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ class SbeCarCodecBench : public CodecBench<SbeCarCodecBench>
{
car.wrapForDecode((char *)buffer, 0, Car::sbeBlockLength(), Car::sbeSchemaVersion(), bufferLength);

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
int64_t tmpInt;
const char *tmpChar;
double tmpDouble;
Expand Down Expand Up @@ -132,6 +134,7 @@ class SbeCarCodecBench : public CodecBench<SbeCarCodecBench>

tmpChar = car.manufacturer();
tmpChar = car.model();
#pragma GCC diagnostic pop

return car.encodedLength();
};
Expand Down
51 changes: 33 additions & 18 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 @@ -294,22 +294,28 @@ private static void generateGroupClassHeader(
dimensionHeaderLength, blockLength, formatClassName(groupName)));

sb.append(
indent + "#if __cplusplus < 201103L\n" +
indent + " template<class Func> inline void forEach(Func& func)\n" +
indent + " {\n" +
indent + " while (hasNext())\n" +
indent + " {\n" +
indent + " next(); func(*this);\n" +
indent + " }\n" +
indent + " }\n\n" +
indent + "#else\n" +
indent + " }\n" +
indent + "#if __cplusplus >= 201103L\n" +
indent + " template<class Func> inline void forEach(Func&& func)\n" +
indent + " {\n" +
indent + " while (hasNext())\n" +
indent + " {\n" +
indent + " next(); func(*this);\n" +
indent + " }\n" +
indent + " }\n\n" +
indent + " }\n" +
indent + " template<class Func> inline void forEach(Func const& func)\n" +
indent + " {\n" +
indent + " while (hasNext())\n" +
indent + " {\n" +
indent + " next(); func(*this);\n" +
indent + " }\n" +
indent + " }\n" +
indent + "#endif\n\n");
}

Expand Down Expand Up @@ -1285,17 +1291,21 @@ private static CharSequence generateFixedFlyweightCode(final String className, f
" m_offset(codec.m_offset),\n" +
" m_actingVersion(codec.m_actingVersion){}\n\n" +
"#if __cplusplus >= 201103L\n" +
" %1$s(%1$s&& codec) :\n" +
" %1$s(%1$s&& codec) SBE_NOEXCEPT :\n" +
" m_buffer(codec.m_buffer),\n" +
" m_bufferLength(codec.m_bufferLength),\n" +
" m_offset(codec.m_offset),\n" +
" m_actingVersion(codec.m_actingVersion){}\n\n" +
" m_actingVersion(codec.m_actingVersion)\n" +
" {\n" +
" codec.reset(%1$s())\n" +
" }\n\n" +
" %1$s& operator=(%1$s&& codec) SBE_NOEXCEPT\n" +
" {\n" +
" m_buffer = codec.m_buffer;\n" +
" m_bufferLength = codec.m_bufferLength;\n" +
" m_offset = codec.m_offset;\n" +
" m_actingVersion = codec.m_actingVersion;\n" +
" if (this != &codec);\n" +
" {\n" +
" reset(codec);\n" +
" codec.reset(%1$s());\n" +
" }\n" +
" return *this;\n" +
" }\n\n" +
"#endif\n\n" +
Expand Down Expand Up @@ -1350,22 +1360,27 @@ private static CharSequence generateConstructorsAndOperators(final String classN
" {\n" +
" reset(codec);\n" +
" }\n\n" +
"#if __cplusplus >= 201103L\n" +
" %1$s(%1$s&& codec)\n" +
" %1$s& operator=(const %1$s& codec) SBE_NOEXCEPT\n" +
" {\n" +
" reset(codec);\n" +
" return *this;\n" +
" }\n\n" +
" %1$s& operator=(%1$s&& codec)\n" +
"#if __cplusplus >= 201103L\n" +
" %1$s(%1$s&& codec) SBE_NOEXCEPT : \n" +
" {\n" +
" reset(codec);\n" +
" return *this;\n" +
" codec.reset(%1$s());\n" +
" }\n\n" +
"#endif\n\n" +
" %1$s& operator=(const %1$s& codec)\n" +
" %1$s& operator =(%1$s&& codec) SBE_NOEXCEPT : \n" +
" {\n" +
" reset(codec);\n" +
" if (this != &codec)\n" +
" {\n" +
" reset(codec);\n" +
" codec.reset(%1$s());\n" +
" }\n" +
" return *this;\n" +
" }\n\n",
" }\n" +
"#endif\n\n",
className);
}

Expand Down