Nest all namespaces
The compiler supports this now. We can type less going forward.
No functional changes.
Signed-off-by: Stephan Pleines <pleines.stephan@gmail.com>
Change-Id: I29d6fa4f9aacc0e381f1a7637294db0392466995
diff --git a/y2020/vision/sift/fast_gaussian.cc b/y2020/vision/sift/fast_gaussian.cc
index 22549ac..69432b4 100644
--- a/y2020/vision/sift/fast_gaussian.cc
+++ b/y2020/vision/sift/fast_gaussian.cc
@@ -6,8 +6,7 @@
#include "y2020/vision/sift/fast_gaussian_all.h"
-namespace frc971 {
-namespace vision {
+namespace frc971::vision {
namespace {
void CheckNonOverlapping(const cv::Mat &a, const cv::Mat &b) {
@@ -122,5 +121,4 @@
cv::subtract(*blurred, source, *difference);
}
-} // namespace vision
-} // namespace frc971
+} // namespace frc971::vision
diff --git a/y2020/vision/sift/fast_gaussian_generator.cc b/y2020/vision/sift/fast_gaussian_generator.cc
index aefb3d9..9b3ca9a 100644
--- a/y2020/vision/sift/fast_gaussian_generator.cc
+++ b/y2020/vision/sift/fast_gaussian_generator.cc
@@ -15,8 +15,7 @@
// https://halide-lang.org/tutorials/tutorial_lesson_15_generators.html has an
// introduction to much of the magic in this file.
-namespace frc971 {
-namespace vision {
+namespace frc971::vision {
namespace {
// Returns a function implementating a 1-dimensional gaussian blur convolution.
@@ -206,8 +205,7 @@
}
};
-} // namespace vision
-} // namespace frc971
+} // namespace frc971::vision
HALIDE_REGISTER_GENERATOR(frc971::vision::GaussianGenerator, gaussian_generator)
HALIDE_REGISTER_GENERATOR(frc971::vision::SubtractGenerator, subtract_generator)
diff --git a/y2020/vision/sift/fast_gaussian_test.cc b/y2020/vision/sift/fast_gaussian_test.cc
index 0ed9e20..27bab54 100644
--- a/y2020/vision/sift/fast_gaussian_test.cc
+++ b/y2020/vision/sift/fast_gaussian_test.cc
@@ -5,9 +5,7 @@
#include "y2020/vision/sift/fast_gaussian_all.h"
-namespace frc971 {
-namespace vision {
-namespace testing {
+namespace frc971::vision::testing {
class FastGaussianTest : public ::testing::Test {
public:
@@ -70,6 +68,4 @@
ExpectEqual(fast, fast_direct, 0);
}
-} // namespace testing
-} // namespace vision
-} // namespace frc971
+} // namespace frc971::vision::testing
diff --git a/y2020/vision/sift/get_gaussian_kernel_test.cc b/y2020/vision/sift/get_gaussian_kernel_test.cc
index e35f06e..3d2674f 100644
--- a/y2020/vision/sift/get_gaussian_kernel_test.cc
+++ b/y2020/vision/sift/get_gaussian_kernel_test.cc
@@ -8,9 +8,7 @@
#include <opencv2/core/mat.hpp>
#include <opencv2/imgproc.hpp>
-namespace frc971 {
-namespace vision {
-namespace testing {
+namespace frc971::vision::testing {
class GetGaussianKernelTest
: public ::testing::TestWithParam<std::tuple<int, double>> {
@@ -33,6 +31,4 @@
::testing::Values(0.01f, 0.1f,
0.9f)));
-} // namespace testing
-} // namespace vision
-} // namespace frc971
+} // namespace frc971::vision::testing
diff --git a/y2020/vision/sift/sift971.cc b/y2020/vision/sift/sift971.cc
index afab9b4..21f9a97 100644
--- a/y2020/vision/sift/sift971.cc
+++ b/y2020/vision/sift/sift971.cc
@@ -118,8 +118,7 @@
using namespace cv;
-namespace frc971 {
-namespace vision {
+namespace frc971::vision {
namespace {
#define USE_AVX2 0
@@ -1288,5 +1287,4 @@
}
}
-} // namespace vision
-} // namespace frc971
+} // namespace frc971::vision