diff options
| -rw-r--r-- | searchcorespi/src/tests/plugin/factoryregistry_test.cpp | 6 | ||||
| -rw-r--r-- | searchcorespi/src/tests/plugin/plugin_test.cpp | 5 | ||||
| -rw-r--r-- | vdslib/src/vespa/vdslib/container/parameters.cpp | 11 |
3 files changed, 10 insertions, 12 deletions
diff --git a/searchcorespi/src/tests/plugin/factoryregistry_test.cpp b/searchcorespi/src/tests/plugin/factoryregistry_test.cpp index 16cb03a5496..3c0214576c8 100644 --- a/searchcorespi/src/tests/plugin/factoryregistry_test.cpp +++ b/searchcorespi/src/tests/plugin/factoryregistry_test.cpp @@ -1,14 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -// Unit tests for factoryregistry. - -#include <vespa/log/log.h> -LOG_SETUP("factoryregistry_test"); -#include <vespa/fastos/fastos.h> #include <vespa/searchcorespi/plugin/factoryregistry.h> #include <vespa/searchcorespi/plugin/iindexmanagerfactory.h> #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/vespalib/util/exceptions.h> using vespalib::string; using namespace searchcorespi; diff --git a/searchcorespi/src/tests/plugin/plugin_test.cpp b/searchcorespi/src/tests/plugin/plugin_test.cpp index 34692b4ed7b..f1fcf30e4d7 100644 --- a/searchcorespi/src/tests/plugin/plugin_test.cpp +++ b/searchcorespi/src/tests/plugin/plugin_test.cpp @@ -1,9 +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/vespalib/testkit/testapp.h> #include <vespa/searchcorespi/plugin/factoryloader.h> -#include <vespa/log/log.h> -LOG_SETUP("factory_test"); +#include <vespa/vespalib/util/exceptions.h> using namespace searchcorespi; diff --git a/vdslib/src/vespa/vdslib/container/parameters.cpp b/vdslib/src/vespa/vdslib/container/parameters.cpp index 0a0fefdb255..5f239b5ced3 100644 --- a/vdslib/src/vespa/vdslib/container/parameters.cpp +++ b/vdslib/src/vespa/vdslib/container/parameters.cpp @@ -156,12 +156,15 @@ std::string Parameters::toString() const return ret; } -template void vdslib::Parameters::set(const vespalib::stringref &, int); -template void vdslib::Parameters::set(const vespalib::stringref &, long); +template void vdslib::Parameters::set(const vespalib::stringref &, int32_t); +template void vdslib::Parameters::set(const vespalib::stringref &, int64_t); +template void vdslib::Parameters::set(const vespalib::stringref &, uint64_t); template void vdslib::Parameters::set(const vespalib::stringref &, double); template void vdslib::Parameters::set(const vespalib::stringref &, const char *); +template void vdslib::Parameters::set(const vespalib::stringref &, vespalib::string); template void vdslib::Parameters::set(const vespalib::stringref &, std::string); -template int vdslib::Parameters::get(const vespalib::stringref &, int) const; -template long vdslib::Parameters::get(const vespalib::stringref &, long) const; +template int32_t vdslib::Parameters::get(const vespalib::stringref &, int32_t) const; +template int64_t vdslib::Parameters::get(const vespalib::stringref &, int64_t) const; +template uint64_t vdslib::Parameters::get(const vespalib::stringref &, uint64_t) const; template double vdslib::Parameters::get(const vespalib::stringref &, double) const; template std::string vdslib::Parameters::get(const vespalib::stringref &, std::string) const;
\ No newline at end of file |