diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-04 00:43:28 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-04 16:36:18 +0200 |
| commit | 67e9b3bd5b22ae02c079e47e56ec9ad7fb7df402 (patch) | |
| tree | 7ad1cac03d3dbe238537e34c75cd465d2c91f5e9 /configgen | |
| parent | f65d05c33c1ff6654860900c8e464ff36263dcdc (diff) | |
Use override
Diffstat (limited to 'configgen')
| -rw-r--r-- | configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java index 7e0ddcd1270..eb17fab5fdb 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java @@ -296,7 +296,7 @@ public class CppClassBuilder implements ClassBuilder { void writeHeaderFunctionDeclarations(Writer w, String className, CNode node, String indent) throws IOException { w.write("" + indent + "const vespalib::string & defName() const override { return CONFIG_DEF_NAME; }\n" - + indent + "const vespalib::string & defVersion() const override { return CONFIG_DEF_VERSION; }\n" + + indent + "const vespalib::string & defVersion() const { return CONFIG_DEF_VERSION; }\n" + indent + "const vespalib::string & defMd5() const override { return CONFIG_DEF_MD5; }\n" + indent + "const vespalib::string & defNamespace() const override { return CONFIG_DEF_NAMESPACE; }\n" + indent + "void serialize(::config::ConfigDataBuffer & __buffer) const override;\n"); @@ -560,13 +560,13 @@ public class CppClassBuilder implements ClassBuilder { w.write("#include <" + subdir + "/" + getFileName(root, "h") + ">"); } w.write("\n"); - w.write("#include <set>\n"); w.write("#include <vespa/config/common/configparser.h>\n"); - w.write("#include <vespa/vespalib/data/slime/convenience.h>\n"); - w.write("#include <vespa/vespalib/stllike/asciistream.h>\n"); - w.write("#include <vespa/vespalib/stllike/asciistream.h>\n"); w.write("#include <vespa/config/configgen/vector_inserter.h>\n"); w.write("#include <vespa/config/configgen/map_inserter.h>\n"); + w.write("#include <vespa/vespalib/data/slime/convenience.h>\n"); + w.write("#include <vespa/vespalib/data/slime/slime.h>\n"); + w.write("#include <vespa/vespalib/stllike/asciistream.h>\n"); + w.write("#include <set>\n"); w.write("\n\n"); writeNameSpaceBegin(w, generateCppNameSpace(root)); w.write("\n"); |