decouple slime from config.

3 files changed, 13 insertions, 8 deletions

diff --git a/config/src/vespa/config/common/misc.cpp b/config/src/vespa/config/common/misc.cpp
index a870308b52e..ca4fa8847b0 100644
--- a/config/src/vespa/config/common/misc.cpp
+++ b/config/src/vespa/config/common/misc.cpp
@@ -4,8 +4,7 @@
 #include <vespa/vespalib/util/md5.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/util/exceptions.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.common.misc");
+#include <vespa/vespalib/data/slime/slime.h>
 
 namespace config {
 
@@ -56,7 +55,6 @@ throwInvalid(const char *format, ...)
     va_start(args, format);
     vsnprintf(buf, sizeof buf, format, args);
     va_end(args);
-    LOG(warning, "Error in configuration: %s", buf);
 
     throw InvalidConfigException(buf);
 }
diff --git a/config/src/vespa/config/common/misc.h b/config/src/vespa/config/common/misc.h
index 0a9d6182299..5a4a68c34aa 100644
--- a/config/src/vespa/config/common/misc.h
+++ b/config/src/vespa/config/common/misc.h
@@ -1,11 +1,18 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/vespalib/stllike/string.h>
-#include <vespa/vespalib/data/slime/slime.h>
-#include <vector>
 #include "exceptions.h"
 #include "configkey.h"
+#include <vespa/vespalib/stllike/string.h>
+#include <vector>
+
+namespace vespalib {
+    class Slime;
+    namespace slime {
+        class Inspector;
+        class Cursor;
+    }
+}
 
 namespace config {
 
@@ -27,5 +34,4 @@ typedef std::shared_ptr<const vespalib::Slime> SlimePtr;
  */
 void copySlimeObject(const vespalib::slime::Inspector & src, vespalib::slime::Cursor & dest);
 
-} // namespace config
-
+}
diff --git a/config/src/vespa/config/retriever/configsnapshot.cpp b/config/src/vespa/config/retriever/configsnapshot.cpp
index d7041f3c680..02331671245 100644
--- a/config/src/vespa/config/retriever/configsnapshot.cpp
+++ b/config/src/vespa/config/retriever/configsnapshot.cpp
@@ -3,6 +3,7 @@
 #include "configsnapshot.h"
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/config/common/misc.h>
+#include <vespa/vespalib/data/slime/slime.h>
 
 using vespalib::Slime;
 using vespalib::slime::Cursor;