diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-11-29 19:48:02 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 02:55:40 +0100 |
| commit | af4d4c5d3a170aeedf2afbcca42367ec3e53c2fa (patch) | |
| tree | 69a26931a15318be8ec1f24ac8869158ea97f9c6 /staging_vespalib | |
| parent | 90917525b8d0d3b2ed977d1965790df9b0a125c6 (diff) | |
include explicit what you need, less is provided by accident.
Diffstat (limited to 'staging_vespalib')
3 files changed, 16 insertions, 21 deletions
diff --git a/staging_vespalib/src/tests/objectdump/objectdump.cpp b/staging_vespalib/src/tests/objectdump/objectdump.cpp index 8e0999ee80a..421e9a4daf6 100644 --- a/staging_vespalib/src/tests/objectdump/objectdump.cpp +++ b/staging_vespalib/src/tests/objectdump/objectdump.cpp @@ -1,10 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP("objectdump_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/objects/identifiable.h> -#include <vespa/vespalib/objects/visit.h> +#include <vespa/vespalib/objects/visit.hpp> #define CID_Base 10000000 #define CID_Foo 10000001 @@ -31,18 +29,18 @@ IMPLEMENT_IDENTIFIABLE(Baz, Base); struct Bar : public Base { DECLARE_IDENTIFIABLE(Bar); - bool _bool; - int8_t _int8; - uint8_t _uint8; - int16_t _int16; - uint16_t _uint16; - int32_t _int32; - uint32_t _uint32; - int64_t _int64; - uint64_t _uint64; - float _float; - double _double; - std::string _string; + bool _bool; + int8_t _int8; + uint8_t _uint8; + int16_t _int16; + uint16_t _uint16; + int32_t _int32; + uint32_t _uint32; + int64_t _int64; + uint64_t _uint64; + float _float; + double _double; + vespalib::string _string; Bar() : _bool(true), _int8(-1), _uint8(1), _int16(-2), _uint16(2), _int32(-4), _uint32(4), _int64(-8), _uint64(8), _float(2.5), _double(2.75), _string("bla bla") {} diff --git a/staging_vespalib/src/tests/objects/identifiable_test.cpp b/staging_vespalib/src/tests/objects/identifiable_test.cpp index 2fe793dae10..ca6f40542aa 100644 --- a/staging_vespalib/src/tests/objects/identifiable_test.cpp +++ b/staging_vespalib/src/tests/objects/identifiable_test.cpp @@ -1,10 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP("identifiable_test"); #include <vespa/vespalib/testkit/testapp.h> -#include <vespa/vespalib/objects/identifiable.h> +#include <vespa/vespalib/objects/identifiable.hpp> #include <vespa/vespalib/objects/namedobject.h> +#include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/util/exceptions.h> using namespace vespalib; diff --git a/staging_vespalib/src/tests/objectselection/objectselection.cpp b/staging_vespalib/src/tests/objectselection/objectselection.cpp index bc09d17fce5..5b51ea5ae59 100644 --- a/staging_vespalib/src/tests/objectselection/objectselection.cpp +++ b/staging_vespalib/src/tests/objectselection/objectselection.cpp @@ -1,9 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP("objectselection_test"); #include <vespa/vespalib/testkit/testapp.h> -#include <vespa/vespalib/objects/identifiable.h> +#include <vespa/vespalib/objects/identifiable.hpp> #include <vespa/vespalib/objects/objectpredicate.h> #include <vespa/vespalib/objects/objectoperation.h> |