diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-10-23 22:46:40 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-10-24 13:04:50 +0200 |
commit | 09465310d539137ce7fc7682bfdbbcdcdf3c5b0e (patch) | |
tree | 83b8df3968ef502ae5bd86cccacbcbfa76a998c0 /vespalib | |
parent | d0bc14f3761a7f86c0286f62a99d20a531305e17 (diff) |
Use nested namespace and standard include syntax.
Diffstat (limited to 'vespalib')
12 files changed, 21 insertions, 57 deletions
diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/avx.cpp b/vespalib/src/vespa/vespalib/hwaccelrated/avx.cpp index c1606170829..14abb93d8d0 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/avx.cpp +++ b/vespalib/src/vespa/vespalib/hwaccelrated/avx.cpp @@ -3,9 +3,7 @@ #include "avx.h" #include "avxprivate.hpp" -namespace vespalib { - -namespace hwaccelrated { +namespace vespalib::hwaccelrated { float AvxAccelrator::dotProduct(const float * af, const float * bf, size_t sz) const @@ -20,4 +18,3 @@ AvxAccelrator::dotProduct(const double * af, const double * bf, size_t sz) const } } -} diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/avx.h b/vespalib/src/vespa/vespalib/hwaccelrated/avx.h index d0965af55a6..ffbe0b8d27f 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/avx.h +++ b/vespalib/src/vespa/vespalib/hwaccelrated/avx.h @@ -4,9 +4,7 @@ #include "sse2.h" -namespace vespalib { - -namespace hwaccelrated { +namespace vespalib::hwaccelrated { /** * Avx-256 implementation. @@ -19,4 +17,3 @@ public: }; } -} diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/avx2.cpp b/vespalib/src/vespa/vespalib/hwaccelrated/avx2.cpp index 4843981c30a..4c4e53e88db 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/avx2.cpp +++ b/vespalib/src/vespa/vespalib/hwaccelrated/avx2.cpp @@ -3,9 +3,7 @@ #include "avx2.h" #include "avxprivate.hpp" -namespace vespalib { - -namespace hwaccelrated { +namespace vespalib::hwaccelrated { float Avx2Accelrator::dotProduct(const float * af, const float * bf, size_t sz) const @@ -20,4 +18,3 @@ Avx2Accelrator::dotProduct(const double * af, const double * bf, size_t sz) cons } } -} diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/avx2.h b/vespalib/src/vespa/vespalib/hwaccelrated/avx2.h index e76ff18727e..f20068c6478 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/avx2.h +++ b/vespalib/src/vespa/vespalib/hwaccelrated/avx2.h @@ -4,9 +4,7 @@ #include "avx.h" -namespace vespalib { - -namespace hwaccelrated { +namespace vespalib::hwaccelrated { /** * Avx-512 implementation. @@ -19,4 +17,3 @@ public: }; } -} diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/avx512.cpp b/vespalib/src/vespa/vespalib/hwaccelrated/avx512.cpp index badc997bb76..4d21c9358ec 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/avx512.cpp +++ b/vespalib/src/vespa/vespalib/hwaccelrated/avx512.cpp @@ -3,9 +3,7 @@ #include "avx512.h" #include "avxprivate.hpp" -namespace vespalib { - -namespace hwaccelrated { +namespace vespalib:: hwaccelrated { float Avx512Accelrator::dotProduct(const float * af, const float * bf, size_t sz) const @@ -20,4 +18,3 @@ Avx512Accelrator::dotProduct(const double * af, const double * bf, size_t sz) co } } -} diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/avx512.h b/vespalib/src/vespa/vespalib/hwaccelrated/avx512.h index 1fe6b283d9a..5807aeeee57 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/avx512.h +++ b/vespalib/src/vespa/vespalib/hwaccelrated/avx512.h @@ -2,11 +2,9 @@ #pragma once -#include <vespa/vespalib/hwaccelrated/avx2.h> +#include "avx2.h" -namespace vespalib { - -namespace hwaccelrated { +namespace vespalib::hwaccelrated { /** * Avx-512 implementation. @@ -19,4 +17,3 @@ public: }; } -} diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/generic.cpp b/vespalib/src/vespa/vespalib/hwaccelrated/generic.cpp index 04e2c73a8a7..1bf7ea1c44c 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/generic.cpp +++ b/vespalib/src/vespa/vespalib/hwaccelrated/generic.cpp @@ -2,9 +2,7 @@ #include "generic.h" -namespace vespalib { - -namespace hwaccelrated { +namespace vespalib::hwaccelrated { namespace { @@ -116,4 +114,3 @@ GenericAccelrator::notBit(void * aOrg, size_t bytes) const } } -} diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/generic.h b/vespalib/src/vespa/vespalib/hwaccelrated/generic.h index 4722179dd66..0115d5c55c7 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/generic.h +++ b/vespalib/src/vespa/vespalib/hwaccelrated/generic.h @@ -4,9 +4,7 @@ #include "iaccelrated.h" -namespace vespalib { - -namespace hwaccelrated { +namespace vespalib::hwaccelrated { /** * Generic cpu agnostic implementation. @@ -25,4 +23,3 @@ public: }; } -} diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.cpp b/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.cpp index df11053ee0f..d2ef5297d72 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.cpp +++ b/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.cpp @@ -1,15 +1,13 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/hwaccelrated/iaccelrated.h> -#include <vespa/vespalib/hwaccelrated/generic.h> -#include <vespa/vespalib/hwaccelrated/sse2.h> -#include <vespa/vespalib/hwaccelrated/avx.h> -#include <vespa/vespalib/hwaccelrated/avx2.h> -#include <vespa/vespalib/hwaccelrated/avx512.h> +#include "iaccelrated.h" +#include "generic.h" +#include "sse2.h" +#include "avx.h" +#include "avx2.h" +#include "avx512.h" -namespace vespalib { - -namespace hwaccelrated { +namespace vespalib::hwaccelrated { namespace { @@ -126,4 +124,3 @@ IAccelrated::getAccelrator() } } -} diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.h b/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.h index ae4798761b0..7c2f2547240 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.h +++ b/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.h @@ -3,11 +3,9 @@ #pragma once #include <memory> -#include <stdint.h> +#include <cstdint> -namespace vespalib { - -namespace hwaccelrated { +namespace vespalib::hwaccelrated { /** * This contains an interface to all primitives that has different cpu supported accelrations. @@ -16,7 +14,7 @@ namespace hwaccelrated { class IAccelrated { public: - virtual ~IAccelrated() { } + virtual ~IAccelrated() = default; typedef std::unique_ptr<IAccelrated> UP; virtual float dotProduct(const float * a, const float * b, size_t sz) const = 0; virtual double dotProduct(const double * a, const double * b, size_t sz) const = 0; @@ -31,4 +29,3 @@ public: }; } -} diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/sse2.cpp b/vespalib/src/vespa/vespalib/hwaccelrated/sse2.cpp index e68a429c8e6..f135de52e5a 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/sse2.cpp +++ b/vespalib/src/vespa/vespalib/hwaccelrated/sse2.cpp @@ -2,9 +2,7 @@ #include "sse2.h" -namespace vespalib { - -namespace hwaccelrated { +namespace vespalib::hwaccelrated { namespace { @@ -79,4 +77,3 @@ Sse2Accelrator::dotProduct(const double * af, const double * bf, size_t sz) cons } } -} diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/sse2.h b/vespalib/src/vespa/vespalib/hwaccelrated/sse2.h index 3bf07bfb75d..a539aa44b03 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/sse2.h +++ b/vespalib/src/vespa/vespalib/hwaccelrated/sse2.h @@ -4,9 +4,7 @@ #include "generic.h" -namespace vespalib { - -namespace hwaccelrated { +namespace vespalib::hwaccelrated { /** * Generic cpu agnostic implementation. @@ -19,4 +17,3 @@ public: }; } -} |