aboutsummaryrefslogtreecommitdiffstats
path: root/document
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-03-15 15:21:10 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2017-03-15 15:51:29 +0100
commit9811aac51b0bffd58737612a5189465de92c4d94 (patch)
tree608f2bd4b381254863358237e90e2b6e75e7b683 /document
parentf31939f3c6ca328917c6316440386c0ac6b91fc4 (diff)
Remove use of LinkedPtr
Diffstat (limited to 'document')
-rw-r--r--document/src/vespa/document/base/fieldpath.h5
-rw-r--r--document/src/vespa/document/fieldvalue/fieldvalue.cpp3
-rw-r--r--document/src/vespa/document/fieldvalue/fieldvalue.h6
3 files changed, 3 insertions, 11 deletions
diff --git a/document/src/vespa/document/base/fieldpath.h b/document/src/vespa/document/base/fieldpath.h
index f1dcde77331..db009f57e43 100644
--- a/document/src/vespa/document/base/fieldpath.h
+++ b/document/src/vespa/document/base/fieldpath.h
@@ -1,11 +1,10 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#pragma once
-#include <vector>
#include <vespa/vespalib/objects/cloneable.h>
-#include <vespa/vespalib/util/linkedptr.h>
-#include <memory>
#include <vespa/document/util/identifiableid.h>
+#include <memory>
+#include <vector>
namespace vespalib {
class ObjectVisitor;
diff --git a/document/src/vespa/document/fieldvalue/fieldvalue.cpp b/document/src/vespa/document/fieldvalue/fieldvalue.cpp
index 6acb3b8e97d..5901ea8b4bf 100644
--- a/document/src/vespa/document/fieldvalue/fieldvalue.cpp
+++ b/document/src/vespa/document/fieldvalue/fieldvalue.cpp
@@ -284,9 +284,6 @@ FieldValue::createArray(const DataType & baseType)
}
}
-bool operator != (const FieldValue::LP & a, const FieldValue::LP & b) { return *a != *b; }
-bool operator < (const FieldValue::LP & a, const FieldValue::LP & b) { return *a < *b; }
-
std::ostream& operator<<(std::ostream& out, const FieldValue & p) {
p.print(out);
return out;
diff --git a/document/src/vespa/document/fieldvalue/fieldvalue.h b/document/src/vespa/document/fieldvalue/fieldvalue.h
index a6e4b3e868f..e2557725854 100644
--- a/document/src/vespa/document/fieldvalue/fieldvalue.h
+++ b/document/src/vespa/document/fieldvalue/fieldvalue.h
@@ -11,13 +11,13 @@
*/
#pragma once
-#include <vespa/vespalib/objects/cloneable.h>
#include "fieldvaluevisitor.h"
#include <vespa/document/datatype/datatype.h>
#include <vespa/document/util/xmlserializable.h>
#include <vespa/vespalib/util/polymorphicarrays.h>
#include <vespa/document/util/bytebuffer.h>
+#include <vespa/vespalib/objects/cloneable.h>
#include <map>
namespace vespalib {
@@ -37,7 +37,6 @@ protected:
public:
typedef std::unique_ptr<FieldValue> UP;
typedef std::shared_ptr<FieldValue> SP;
- typedef vespalib::LinkedPtr<FieldValue> LP;
typedef vespalib::CloneablePtr<FieldValue> CP;
class IteratorHandler {
@@ -313,9 +312,6 @@ private:
IteratorHandler & handler) const;
};
-bool operator != (const FieldValue::LP & a, const FieldValue::LP & b);
-bool operator < (const FieldValue::LP & a, const FieldValue::LP & b);
-
std::ostream& operator<<(std::ostream& out, const FieldValue & p);
XmlOutputStream & operator<<(XmlOutputStream & out, const FieldValue & p);