From 72f05aefa698fa3856ca2b57c6c0b40274c74f87 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Tue, 2 May 2017 14:41:57 +0200
Subject: Fix warnings hidden earlier due to including application headers as
 system includes

---
 .../src/vespa/searchcommon/attribute/config.cpp    | 12 +++---
 .../src/vespa/searchcommon/attribute/config.h      | 46 +++++++---------------
 .../src/vespa/searchcommon/common/iblobconverter.h |  1 +
 3 files changed, 21 insertions(+), 38 deletions(-)

(limited to 'searchcommon/src')

diff --git a/searchcommon/src/vespa/searchcommon/attribute/config.cpp b/searchcommon/src/vespa/searchcommon/attribute/config.cpp
index e7a4c28b27a..293606a3a12 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/config.cpp
+++ b/searchcommon/src/vespa/searchcommon/attribute/config.cpp
@@ -1,11 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/searchcommon/attribute/config.h>
-#include <vespa/vespalib/util/exceptions.h>
-#include <limits.h>
+#include "config.h"
 
-namespace search {
-namespace attribute {
+namespace search::attribute {
 
 Config::Config() :
     _basicType(BasicType::NONE),
@@ -42,5 +39,8 @@ Config::Config(BasicType bt,
 {
 }
 
-}
+Config::Config(const Config &) = default;
+Config & Config::operator = (const Config &) = default;
+Config::~Config() {}
+
 }
diff --git a/searchcommon/src/vespa/searchcommon/attribute/config.h b/searchcommon/src/vespa/searchcommon/attribute/config.h
index be2a1d2777d..322e8c83824 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/config.h
+++ b/searchcommon/src/vespa/searchcommon/attribute/config.h
@@ -2,12 +2,12 @@
 
 #pragma once
 
-#include <vespa/searchcommon/attribute/basictype.h>
-#include <vespa/searchcommon/attribute/collectiontype.h>
+#include "basictype.h"
+#include "collectiontype.h"
+#include "predicate_params.h"
 #include <vespa/searchcommon/common/growstrategy.h>
 #include <vespa/searchcommon/common/compaction_strategy.h>
 #include <vespa/eval/eval/value_type.h>
-#include "predicate_params.h"
 
 namespace search {
 namespace attribute {
@@ -16,11 +16,11 @@ class Config
 {
 public:
     Config();
-
-    Config(BasicType bt,
-           CollectionType ct = CollectionType::SINGLE,
-           bool fastSearch_ = false,
-           bool huge_ = false);
+    Config(BasicType bt, CollectionType ct = CollectionType::SINGLE,
+           bool fastSearch_ = false, bool huge_ = false);
+    Config(const Config &);
+    Config & operator = (const Config &);
+    ~Config();
 
     BasicType basicType()                 const { return _basicType; }
     CollectionType collectionType()       const { return _type; }
@@ -33,27 +33,15 @@ public:
      * Check if attribute posting list can consist of a bitvector in
      * addition to (or instead of) a btree. 
      */
-    bool
-    getEnableBitVectors(void) const
-    {
-        return _enableBitVectors;
-    }
+    bool getEnableBitVectors() const { return _enableBitVectors; }
 
     /**
      * Check if attribute posting list can consist of only a bitvector with
      * no corresponding btree.
      */
-    bool
-    getEnableOnlyBitVector(void) const
-    {
-        return _enableOnlyBitVector;
-    }
+    bool getEnableOnlyBitVector() const { return _enableOnlyBitVector; }
 
-    bool
-    getIsFilter(void) const
-    {
-        return _isFilter;
-    }
+    bool getIsFilter() const { return _isFilter; }
 
     /**
      * Check if this attribute should be fast accessible at all times.
@@ -74,9 +62,7 @@ public:
      * Enable attribute posting list to consist of a bitvector in
      * addition to (or instead of) a btree. 
      */
-    void
-    setEnableBitVectors(bool enableBitVectors)
-    {
+    void setEnableBitVectors(bool enableBitVectors) {
         _enableBitVectors = enableBitVectors;
     }
 
@@ -86,18 +72,14 @@ public:
      * document frequency goes down, since recreated btree representation
      * will then have lost weight information.
      */
-    void
-    setEnableOnlyBitVector(bool enableOnlyBitVector)
-    {
+    void setEnableOnlyBitVector(bool enableOnlyBitVector) {
         _enableOnlyBitVector = enableOnlyBitVector;
     }
 
     /**
      * Hide weight information when searching in attributes.
      */
-    void
-    setIsFilter(bool isFilter)
-    {
+    void setIsFilter(bool isFilter) {
         _isFilter = isFilter;
     }
 
diff --git a/searchcommon/src/vespa/searchcommon/common/iblobconverter.h b/searchcommon/src/vespa/searchcommon/common/iblobconverter.h
index 789d91ba8d8..4a8c73757d8 100644
--- a/searchcommon/src/vespa/searchcommon/common/iblobconverter.h
+++ b/searchcommon/src/vespa/searchcommon/common/iblobconverter.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <vespa/vespalib/util/buffer.h>
+#include <memory>
 
 namespace search {
 namespace common {
-- 
cgit v1.2.3