Merge pull request #12136 from vespa-engine/balder/catch-and-exit-nicely-on-config-error

Catch and exit nicely on config error.

2 files changed, 3 insertions, 11 deletions

diff --git a/config/src/vespa/config/configgen/value_converter.cpp b/config/src/vespa/config/configgen/value_converter.cpp
index 1f78e78cc32..06086939d58 100644
--- a/config/src/vespa/config/configgen/value_converter.cpp
+++ b/config/src/vespa/config/configgen/value_converter.cpp
@@ -7,9 +7,7 @@
 using namespace vespalib;
 using namespace vespalib::slime;
 
-namespace config {
-
-namespace internal {
+namespace config::internal {
 
 template<>
 int32_t convertValue(const ::vespalib::slime::Inspector & __inspector) {
@@ -64,4 +62,3 @@ requireValid(const vespalib::string & __fieldName, const ::vespalib::slime::Insp
 
 }
 
-}
diff --git a/config/src/vespa/config/configgen/value_converter.h b/config/src/vespa/config/configgen/value_converter.h
index d2d04169c1d..6ad67bf6f86 100644
--- a/config/src/vespa/config/configgen/value_converter.h
+++ b/config/src/vespa/config/configgen/value_converter.h
@@ -5,9 +5,7 @@
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/data/slime/inspector.h>
 
-namespace config {
-
-namespace internal {
+namespace config::internal {
 
 void requireValid(const vespalib::string & __fieldName, const ::vespalib::slime::Inspector & __inspector);
 
@@ -43,7 +41,4 @@ struct ValueConverter {
     }
 };
 
-} // namespace internal
-
-} // namespace config
-
+}