commit 58593994ad4c2c7cedaeb4cab650bc00a08abaac
author Andreas Huber <andih@google.com> Mon Oct 10 20:59:37 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 10 20:59:38 2016 +0000
tree bf38db7c8db26549cd8f0e30e94c05c9a09e9df8
parent 1711e46b2b72f55e50639c6f7ab84a8f69dbc45c
parent e3f769aa75dd6be6bb1ba83904def47d9e464769

Merge "Enum types now emit operator| and operator|= for easier bitset manipulation."

CompoundType.cpp

diff --git a/CompoundType.cpp b/CompoundType.cpp
index 7c8e04a..71d17bf 100644
--- a/CompoundType.cpp
+++ b/CompoundType.cpp
@@ -394,7 +394,8 @@
 
 status_t CompoundType::emitTypeDefinitions(
         Formatter &out, const std::string prefix) const {
-    status_t err = Scope::emitTypeDefinitions(out, prefix + "::" + localName());
+    std::string space = prefix.empty() ? "" : (prefix + "::");
+    status_t err = Scope::emitTypeDefinitions(out, space + localName());
 
     if (err != OK) {
         return err;