aboutsummaryrefslogtreecommitdiffstats
path: root/staging_vespalib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-12-21 05:01:45 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2016-12-21 05:01:45 +0000
commit2b51ff0dfcee66b2ed67ef3ce53eb3ef769cb585 (patch)
treee8f50c53751966585cd4490c722277179a5693da /staging_vespalib
parent9dd38b4d1f01fded878ef6b5488e48cccc5f4acd (diff)
Deinline some non-trivial methods and do not provide assert.h in string.
Diffstat (limited to 'staging_vespalib')
-rw-r--r--staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp1
-rw-r--r--staging_vespalib/src/vespa/vespalib/util/xmlserializable.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp b/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp
index 64affd5318e..204e5119397 100644
--- a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp
+++ b/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp
@@ -2,6 +2,7 @@
#include "jsonwriter.h"
#include <vespa/vespalib/stllike/asciistream.h>
#include <cmath>
+#include <cassert>
namespace vespalib {
diff --git a/staging_vespalib/src/vespa/vespalib/util/xmlserializable.cpp b/staging_vespalib/src/vespa/vespalib/util/xmlserializable.cpp
index 75d10f46262..d7f482fdf26 100644
--- a/staging_vespalib/src/vespa/vespalib/util/xmlserializable.cpp
+++ b/staging_vespalib/src/vespa/vespalib/util/xmlserializable.cpp
@@ -1,9 +1,10 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/vespalib/util/xmlserializable.hpp>
-#include <vector>
#include <vespa/vespalib/encoding/base64.h>
#include <vespa/vespalib/stllike/asciistream.h>
+#include <vector>
+#include <cassert>
namespace vespalib {
namespace xml {