diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-07-29 13:45:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-29 13:45:12 +0200 |
| commit | 711b349d5d74a99a06154358452c609ac14b84ce (patch) | |
| tree | 6e8cfe4dc546737c5ca7a1594ff19f1563c89197 /configgen | |
| parent | 87dd83bd3b8965e2e71502f38870826945eaaa32 (diff) | |
| parent | b70b62339ca000aaa95ba5c3331c27293d016d0d (diff) | |
Merge pull request #10109 from vespa-engine/musum/add-TODOs
Add TODOs
Diffstat (limited to 'configgen')
| -rw-r--r-- | configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java | 1 | ||||
| -rw-r--r-- | configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java | 2 |
2 files changed, 1 insertions, 2 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 216a6b50981..14f1e15f4f2 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java @@ -313,7 +313,6 @@ 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 { 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"); diff --git a/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java b/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java index 5c447191614..75149d7a50e 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java @@ -96,7 +96,7 @@ public class JavaClassBuilder implements ClassBuilder { " public final static String CONFIG_DEF_MD5 = \"" + root.getMd5() + "\";\n" + // " public final static String CONFIG_DEF_NAME = \"" + root.getName() + "\";\n" + // " public final static String CONFIG_DEF_NAMESPACE = \"" + root.getNamespace() + "\";\n" + // - " public final static String CONFIG_DEF_VERSION = \"" + root.getVersion() + "\";\n" + // + " public final static String CONFIG_DEF_VERSION = \"" + root.getVersion() + "\";\n" + // TODO: Remove on Vespa 8 " public final static String[] CONFIG_DEF_SCHEMA = {\n" + // "" + indentCode(INDENTATION + INDENTATION, getDefSchema()) + "\n" + // " };\n" + // |