aboutsummaryrefslogtreecommitdiffstats
path: root/document
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-12-19 21:49:12 +0100
committerGitHub <noreply@github.com>2016-12-19 21:49:12 +0100
commit18503431e07455248d3eb12e23064ecb0d1c4f3f (patch)
tree0d5a59b141ff21430a4917afad43560d4e91cc66 /document
parent614d85742ccb81ab4538b17fe570154a10b6b110 (diff)
parentf56a323036902ad5fd10c5b9f7f1c88d92007167 (diff)
Merge pull request #1357 from yahoo/balder/do-not-include-fastos-first
Balder/do not include fastos first
Diffstat (limited to 'document')
-rw-r--r--document/src/tests/documentcalculatortestcase.cpp1
-rw-r--r--document/src/tests/fieldpathupdatetestcase.cpp1
-rw-r--r--document/src/vespa/document/bucket/bucketidfactory.h1
-rw-r--r--document/src/vespa/document/util/bytebuffer.cpp1
4 files changed, 3 insertions, 1 deletions
diff --git a/document/src/tests/documentcalculatortestcase.cpp b/document/src/tests/documentcalculatortestcase.cpp
index 0279d850dfd..357f6db0cfc 100644
--- a/document/src/tests/documentcalculatortestcase.cpp
+++ b/document/src/tests/documentcalculatortestcase.cpp
@@ -9,6 +9,7 @@
#include <vespa/document/fieldvalue/intfieldvalue.h>
#include <vespa/document/fieldvalue/longfieldvalue.h>
#include <vespa/document/fieldvalue/floatfieldvalue.h>
+#include <vespa/vespalib/util/exceptions.h>
namespace document {
diff --git a/document/src/tests/fieldpathupdatetestcase.cpp b/document/src/tests/fieldpathupdatetestcase.cpp
index 6288d19f3a1..3f14629f1e1 100644
--- a/document/src/tests/fieldpathupdatetestcase.cpp
+++ b/document/src/tests/fieldpathupdatetestcase.cpp
@@ -12,6 +12,7 @@
#include <vespa/vespalib/testkit/testapp.h>
#include <vespa/document/serialization/vespadocumentserializer.h>
#include <vespa/vespalib/objects/nbostream.h>
+#include <vespa/vespalib/util/exceptions.h>
#include <fstream>
#include <sstream>
diff --git a/document/src/vespa/document/bucket/bucketidfactory.h b/document/src/vespa/document/bucket/bucketidfactory.h
index a09bb4156a6..fb4fc919fed 100644
--- a/document/src/vespa/document/bucket/bucketidfactory.h
+++ b/document/src/vespa/document/bucket/bucketidfactory.h
@@ -15,7 +15,6 @@
#pragma once
#include <vespa/document/util/printable.h>
-#include <vespa/fastos/fastos.h>
namespace document {
diff --git a/document/src/vespa/document/util/bytebuffer.cpp b/document/src/vespa/document/util/bytebuffer.cpp
index 4b27a7afa59..c7e1182a279 100644
--- a/document/src/vespa/document/util/bytebuffer.cpp
+++ b/document/src/vespa/document/util/bytebuffer.cpp
@@ -10,6 +10,7 @@
#include "stringutil.h"
#include <vespa/vespalib/stllike/asciistream.h>
#include <sstream>
+#include <arpa/inet.h>
#define LOG_DEBUG1(a)
// Enable this macros instead to see what bytebuffer calls come