10 files changed, 15 insertions, 14 deletions
diff --git a/config/src/vespa/config/common/configresponse.h b/config/src/vespa/config/common/configresponse.h
index 4bb1cc9f808..10c2af81feb 100644
--- a/config/src/vespa/config/common/configresponse.h
+++ b/config/src/vespa/config/common/configresponse.h
@@ -7,7 +7,7 @@ namespace config {
 
 class ConfigValue;
 class ConfigKey;
-class ConfigState;
+struct ConfigState;
 class Trace;
 
 /**
diff --git a/config/src/vespa/config/common/configvalue.h b/config/src/vespa/config/common/configvalue.h
index 7bbd48df258..706fda0d2ba 100644
--- a/config/src/vespa/config/common/configvalue.h
+++ b/config/src/vespa/config/common/configvalue.h
@@ -8,7 +8,7 @@
 #include <memory>
 #include <climits>
 
-namespace vespalib::slime { class Cursor; }
+namespace vespalib::slime { struct Cursor; }
 
 namespace config {
 
diff --git a/config/src/vespa/config/common/misc.cpp b/config/src/vespa/config/common/misc.cpp
index c0f8c96f8d4..1040962e25c 100644
--- a/config/src/vespa/config/common/misc.cpp
+++ b/config/src/vespa/config/common/misc.cpp
@@ -37,7 +37,7 @@ calculateContentMd5(const std::vector<vespalib::string> & fileContents)
         if (md5sum[i] < 16) {
             s << "0";
         }
-        s << std::hex << (int)md5sum[i];
+        s << vespalib::hex << (int)md5sum[i];
     }
     return s.str();
 }
diff --git a/config/src/vespa/config/common/misc.h b/config/src/vespa/config/common/misc.h
index d0f06512f50..b58891eda60 100644
--- a/config/src/vespa/config/common/misc.h
+++ b/config/src/vespa/config/common/misc.h
@@ -8,8 +8,8 @@
 namespace vespalib {
     class Slime;
     namespace slime {
-        class Inspector;
-        class Cursor;
+        struct Inspector;
+        struct Cursor;
     }
 }
 
diff --git a/config/src/vespa/config/configgen/configpayload.h b/config/src/vespa/config/configgen/configpayload.h
index 1a20eab9ef6..47eb463f35c 100644
--- a/config/src/vespa/config/configgen/configpayload.h
+++ b/config/src/vespa/config/configgen/configpayload.h
@@ -3,7 +3,7 @@
 
 namespace vespalib {
     namespace slime {
-        class Inspector;
+        struct Inspector;
     }
 }
 
diff --git a/config/src/vespa/config/configgen/value_converter.cpp b/config/src/vespa/config/configgen/value_converter.cpp
index 4241b5354fd..1f78e78cc32 100644
--- a/config/src/vespa/config/configgen/value_converter.cpp
+++ b/config/src/vespa/config/configgen/value_converter.cpp
@@ -2,6 +2,7 @@
 #include "value_converter.h"
 #include <vespa/config/common/exceptions.h>
 #include <vespa/vespalib/locale/c.h>
+#include <vespa/vespalib/util/stringfmt.h>
 
 using namespace vespalib;
 using namespace vespalib::slime;
@@ -17,7 +18,7 @@ int32_t convertValue(const ::vespalib::slime::Inspector & __inspector) {
         case DOUBLE::ID: return static_cast<int32_t>(__inspector.asDouble());
         case STRING::ID: return static_cast<int32_t>(strtoll(__inspector.asString().make_string().c_str(), 0, 0));
     }
-    throw InvalidConfigException("Expected int32_t, but got incompatible config type " + __inspector.type().getId());
+    throw InvalidConfigException(make_string("Expected int32_t, but got incompatible config type %u", __inspector.type().getId()));
 }
 
 template<>
@@ -27,7 +28,7 @@ int64_t convertValue(const ::vespalib::slime::Inspector & __inspector) {
         case DOUBLE::ID: return static_cast<int64_t>(__inspector.asDouble());
         case STRING::ID: return static_cast<int64_t>(strtoll(__inspector.asString().make_string().c_str(), 0, 0));
     }
-    throw InvalidConfigException("Expected int64_t, but got incompatible config type " + __inspector.type().getId());
+    throw InvalidConfigException(make_string("Expected int64_t, but got incompatible config type %u", __inspector.type().getId()));
 }
 
 template<>
@@ -37,7 +38,7 @@ double convertValue(const ::vespalib::slime::Inspector & __inspector) {
         case DOUBLE::ID: return static_cast<double>(__inspector.asDouble());
         case STRING::ID: return static_cast<double>(vespalib::locale::c::strtod(__inspector.asString().make_string().c_str(), 0));
     }
-    throw InvalidConfigException("Expected double, but got incompatible config type " + __inspector.type().getId());
+    throw InvalidConfigException(make_string("Expected double, but got incompatible config type %u", __inspector.type().getId()));
 }
 
 template<>
@@ -48,7 +49,7 @@ bool convertValue(const ::vespalib::slime::Inspector & __inspector) {
             vespalib::string s(__inspector.asString().make_string());
             return s.compare("true") == 0 ? true : false;
     }
-    throw InvalidConfigException("Expected bool, but got incompatible config type " + __inspector.type().getId());
+    throw InvalidConfigException(make_string("Expected bool, but got incompatible config type %u", __inspector.type().getId()));
 }
 
 template<>
diff --git a/config/src/vespa/config/frt/frtconfigrequestv3.h b/config/src/vespa/config/frt/frtconfigrequestv3.h
index 3b671e52c08..83cbac765f9 100644
--- a/config/src/vespa/config/frt/frtconfigrequestv3.h
+++ b/config/src/vespa/config/frt/frtconfigrequestv3.h
@@ -11,7 +11,7 @@ namespace config {
 class ConfigKey;
 class Connection;
 class Trace;
-class VespaVersion;
+struct VespaVersion;
 
 class FRTConfigRequestV3 : public SlimeConfigRequest {
 public:
diff --git a/config/src/vespa/config/frt/protocol.h b/config/src/vespa/config/frt/protocol.h
index 176f2c34026..805ce6ff81b 100644
--- a/config/src/vespa/config/frt/protocol.h
+++ b/config/src/vespa/config/frt/protocol.h
@@ -9,7 +9,7 @@
 namespace vespalib {
     class Slime;
     namespace slime {
-        class Inspector;
+        struct Inspector;
     }
 }
 
diff --git a/config/src/vespa/config/frt/slimeconfigrequest.h b/config/src/vespa/config/frt/slimeconfigrequest.h
index 60c44b6c97f..7ac55b7c70e 100644
--- a/config/src/vespa/config/frt/slimeconfigrequest.h
+++ b/config/src/vespa/config/frt/slimeconfigrequest.h
@@ -13,7 +13,7 @@ namespace config {
 class ConfigKey;
 class Connection;
 class Trace;
-class VespaVersion;
+struct VespaVersion;
 
 class SlimeConfigRequest : public FRTConfigRequest {
 public:
diff --git a/config/src/vespa/config/subscription/sourcespec.h b/config/src/vespa/config/subscription/sourcespec.h
index 22db2368c01..0187049e733 100644
--- a/config/src/vespa/config/subscription/sourcespec.h
+++ b/config/src/vespa/config/subscription/sourcespec.h
@@ -10,7 +10,7 @@ namespace config {
 
 class ConfigInstance;
 class SourceFactory;
-class TimingValues;
+struct TimingValues;
 
 typedef vespalib::string SourceSpecKey;