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/frc971/zeroing/absolute_and_absolute_encoder.cc b/frc971/zeroing/absolute_and_absolute_encoder.cc
index 03ef3f1..b9ba33d 100644
--- a/frc971/zeroing/absolute_and_absolute_encoder.cc
+++ b/frc971/zeroing/absolute_and_absolute_encoder.cc
@@ -8,8 +8,7 @@
#include "aos/logging/logging.h"
#include "frc971/zeroing/wrap.h"
-namespace frc971 {
-namespace zeroing {
+namespace frc971::zeroing {
AbsoluteAndAbsoluteEncoderZeroingEstimator::
AbsoluteAndAbsoluteEncoderZeroingEstimator(
@@ -234,5 +233,4 @@
return builder.Finish();
}
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing
diff --git a/frc971/zeroing/absolute_and_absolute_encoder_test.cc b/frc971/zeroing/absolute_and_absolute_encoder_test.cc
index 5dac38b..08ab924 100644
--- a/frc971/zeroing/absolute_and_absolute_encoder_test.cc
+++ b/frc971/zeroing/absolute_and_absolute_encoder_test.cc
@@ -6,9 +6,7 @@
#include "frc971/zeroing/zeroing_test.h"
-namespace frc971 {
-namespace zeroing {
-namespace testing {
+namespace frc971::zeroing::testing {
using constants::AbsoluteAndAbsoluteEncoderZeroingConstants;
@@ -343,6 +341,4 @@
::testing::ElementsAre(ZeroingError::OFFSET_MOVED_TOO_FAR));
}
-} // namespace testing
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing::testing
diff --git a/frc971/zeroing/absolute_encoder.cc b/frc971/zeroing/absolute_encoder.cc
index aa68acf..f5e3e3d 100644
--- a/frc971/zeroing/absolute_encoder.cc
+++ b/frc971/zeroing/absolute_encoder.cc
@@ -8,8 +8,7 @@
#include "aos/containers/error_list.h"
#include "frc971/zeroing/wrap.h"
-namespace frc971 {
-namespace zeroing {
+namespace frc971::zeroing {
AbsoluteEncoderZeroingEstimator::AbsoluteEncoderZeroingEstimator(
const constants::AbsoluteEncoderZeroingConstants &constants)
@@ -181,5 +180,4 @@
return builder.Finish();
}
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing
diff --git a/frc971/zeroing/absolute_encoder_test.cc b/frc971/zeroing/absolute_encoder_test.cc
index 6e78faa..aa2fb9f 100644
--- a/frc971/zeroing/absolute_encoder_test.cc
+++ b/frc971/zeroing/absolute_encoder_test.cc
@@ -5,9 +5,7 @@
#include "frc971/zeroing/zeroing_test.h"
-namespace frc971 {
-namespace zeroing {
-namespace testing {
+namespace frc971::zeroing::testing {
using constants::AbsoluteEncoderZeroingConstants;
@@ -169,6 +167,4 @@
::testing::ElementsAre(ZeroingError::LOST_ABSOLUTE_ENCODER));
}
-} // namespace testing
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing::testing
diff --git a/frc971/zeroing/averager_test.cc b/frc971/zeroing/averager_test.cc
index 50eac72..d4f154a 100644
--- a/frc971/zeroing/averager_test.cc
+++ b/frc971/zeroing/averager_test.cc
@@ -2,8 +2,7 @@
#include "gtest/gtest.h"
-namespace frc971 {
-namespace zeroing {
+namespace frc971::zeroing {
class AveragerTest : public ::testing::Test {
protected:
@@ -57,5 +56,4 @@
ASSERT_EQ(0.0, averager.GetAverage()(0, 0));
}
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing
diff --git a/frc971/zeroing/continuous_absolute_encoder.cc b/frc971/zeroing/continuous_absolute_encoder.cc
index a47a491..ebaf101 100644
--- a/frc971/zeroing/continuous_absolute_encoder.cc
+++ b/frc971/zeroing/continuous_absolute_encoder.cc
@@ -8,8 +8,7 @@
#include "aos/containers/error_list.h"
#include "frc971/zeroing/wrap.h"
-namespace frc971 {
-namespace zeroing {
+namespace frc971::zeroing {
ContinuousAbsoluteEncoderZeroingEstimator::
ContinuousAbsoluteEncoderZeroingEstimator(
@@ -165,5 +164,4 @@
return builder.Finish();
}
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing
diff --git a/frc971/zeroing/continuous_absolute_encoder_test.cc b/frc971/zeroing/continuous_absolute_encoder_test.cc
index 75d6de0..f0b1415 100644
--- a/frc971/zeroing/continuous_absolute_encoder_test.cc
+++ b/frc971/zeroing/continuous_absolute_encoder_test.cc
@@ -6,9 +6,7 @@
#include "frc971/zeroing/wrap.h"
#include "frc971/zeroing/zeroing_test.h"
-namespace frc971 {
-namespace zeroing {
-namespace testing {
+namespace frc971::zeroing::testing {
using constants::ContinuousAbsoluteEncoderZeroingConstants;
@@ -193,6 +191,4 @@
::testing::ElementsAre(ZeroingError::LOST_ABSOLUTE_ENCODER));
}
-} // namespace testing
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing::testing
diff --git a/frc971/zeroing/hall_effect_and_position.cc b/frc971/zeroing/hall_effect_and_position.cc
index e074668..99454e4 100644
--- a/frc971/zeroing/hall_effect_and_position.cc
+++ b/frc971/zeroing/hall_effect_and_position.cc
@@ -6,8 +6,7 @@
#include "glog/logging.h"
-namespace frc971 {
-namespace zeroing {
+namespace frc971::zeroing {
HallEffectAndPositionZeroingEstimator::HallEffectAndPositionZeroingEstimator(
const ZeroingConstants &constants)
@@ -123,5 +122,4 @@
return builder.Finish();
}
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing
diff --git a/frc971/zeroing/hall_effect_and_position_test.cc b/frc971/zeroing/hall_effect_and_position_test.cc
index c9ddf65..d49d900 100644
--- a/frc971/zeroing/hall_effect_and_position_test.cc
+++ b/frc971/zeroing/hall_effect_and_position_test.cc
@@ -4,9 +4,7 @@
#include "frc971/zeroing/zeroing_test.h"
-namespace frc971 {
-namespace zeroing {
-namespace testing {
+namespace frc971::zeroing::testing {
class HallEffectAndPositionZeroingTest : public ZeroingTest {
protected:
@@ -130,6 +128,4 @@
EXPECT_FALSE(estimator.zeroed());
}
-} // namespace testing
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing::testing
diff --git a/frc971/zeroing/pot_and_absolute_encoder.cc b/frc971/zeroing/pot_and_absolute_encoder.cc
index f62b393..bef6f2d 100644
--- a/frc971/zeroing/pot_and_absolute_encoder.cc
+++ b/frc971/zeroing/pot_and_absolute_encoder.cc
@@ -8,8 +8,7 @@
#include "aos/containers/error_list.h"
#include "frc971/zeroing/wrap.h"
-namespace frc971 {
-namespace zeroing {
+namespace frc971::zeroing {
PotAndAbsoluteEncoderZeroingEstimator::PotAndAbsoluteEncoderZeroingEstimator(
const constants::PotAndAbsoluteEncoderZeroingConstants &constants)
@@ -200,5 +199,4 @@
return builder.Finish();
}
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing
diff --git a/frc971/zeroing/pot_and_absolute_encoder_test.cc b/frc971/zeroing/pot_and_absolute_encoder_test.cc
index 4cd3821..00e69bf 100644
--- a/frc971/zeroing/pot_and_absolute_encoder_test.cc
+++ b/frc971/zeroing/pot_and_absolute_encoder_test.cc
@@ -5,9 +5,7 @@
#include "frc971/zeroing/zeroing_test.h"
-namespace frc971 {
-namespace zeroing {
-namespace testing {
+namespace frc971::zeroing::testing {
using constants::PotAndAbsoluteEncoderZeroingConstants;
@@ -149,6 +147,4 @@
::testing::ElementsAre(ZeroingError::LOST_ABSOLUTE_ENCODER));
}
-} // namespace testing
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing::testing
diff --git a/frc971/zeroing/pot_and_index.cc b/frc971/zeroing/pot_and_index.cc
index 0f1e9e0..fb82f22 100644
--- a/frc971/zeroing/pot_and_index.cc
+++ b/frc971/zeroing/pot_and_index.cc
@@ -4,8 +4,7 @@
#include "glog/logging.h"
-namespace frc971 {
-namespace zeroing {
+namespace frc971::zeroing {
PotAndIndexPulseZeroingEstimator::PotAndIndexPulseZeroingEstimator(
const constants::PotAndIndexPulseZeroingConstants &constants)
@@ -131,5 +130,4 @@
return builder.Finish();
}
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing
diff --git a/frc971/zeroing/pot_and_index_test.cc b/frc971/zeroing/pot_and_index_test.cc
index f2e464f..ef90661 100644
--- a/frc971/zeroing/pot_and_index_test.cc
+++ b/frc971/zeroing/pot_and_index_test.cc
@@ -4,9 +4,7 @@
#include "frc971/zeroing/zeroing_test.h"
-namespace frc971 {
-namespace zeroing {
-namespace testing {
+namespace frc971::zeroing::testing {
using constants::PotAndIndexPulseZeroingConstants;
@@ -278,6 +276,4 @@
ASSERT_TRUE(estimator.error());
}
-} // namespace testing
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing::testing
diff --git a/frc971/zeroing/pulse_index.cc b/frc971/zeroing/pulse_index.cc
index c0831e8..6e9a502 100644
--- a/frc971/zeroing/pulse_index.cc
+++ b/frc971/zeroing/pulse_index.cc
@@ -5,8 +5,7 @@
#include "glog/logging.h"
-namespace frc971 {
-namespace zeroing {
+namespace frc971::zeroing {
void PulseIndexZeroingEstimator::Reset() {
max_index_position_ = ::std::numeric_limits<double>::lowest();
@@ -112,5 +111,4 @@
return builder.Finish();
}
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing
diff --git a/frc971/zeroing/pulse_index_test.cc b/frc971/zeroing/pulse_index_test.cc
index bd257f7..c07644d 100644
--- a/frc971/zeroing/pulse_index_test.cc
+++ b/frc971/zeroing/pulse_index_test.cc
@@ -4,9 +4,7 @@
#include "frc971/zeroing/zeroing_test.h"
-namespace frc971 {
-namespace zeroing {
-namespace testing {
+namespace frc971::zeroing::testing {
using constants::EncoderPlusIndexZeroingConstants;
@@ -127,6 +125,4 @@
}
}
-} // namespace testing
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing::testing
diff --git a/frc971/zeroing/relative_encoder_test.cc b/frc971/zeroing/relative_encoder_test.cc
index 6256fe7..28fe978 100644
--- a/frc971/zeroing/relative_encoder_test.cc
+++ b/frc971/zeroing/relative_encoder_test.cc
@@ -3,9 +3,7 @@
#include "frc971/zeroing/zeroing.h"
#include "frc971/zeroing/zeroing_test.h"
-namespace frc971 {
-namespace zeroing {
-namespace testing {
+namespace frc971::zeroing::testing {
class RelativeEncoderZeroingTest : public ZeroingTest {
protected:
@@ -35,6 +33,4 @@
EXPECT_DOUBLE_EQ(GetEstimatorPosition(&estimator), 0.1);
}
-} // namespace testing
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing::testing
diff --git a/frc971/zeroing/unwrap_test.cc b/frc971/zeroing/unwrap_test.cc
index b71c8b6..0a185b1 100644
--- a/frc971/zeroing/unwrap_test.cc
+++ b/frc971/zeroing/unwrap_test.cc
@@ -2,9 +2,7 @@
#include "frc971/zeroing/wrap.h"
-namespace frc971 {
-namespace zeroing {
-namespace testing {
+namespace frc971::zeroing::testing {
TEST(SensorTest, UnwrapOnce) {
// Test the sensor moving over the maximum range value and wrapping once
@@ -63,6 +61,4 @@
EXPECT_EQ(sensor.Unwrap(0.2), 0.2); // move = 1.0, wrap -1
}
-} // namespace testing
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing::testing
diff --git a/frc971/zeroing/wrap.cc b/frc971/zeroing/wrap.cc
index 1a0504f..2e0e3bc 100644
--- a/frc971/zeroing/wrap.cc
+++ b/frc971/zeroing/wrap.cc
@@ -2,8 +2,7 @@
#include <cmath>
-namespace frc971 {
-namespace zeroing {
+namespace frc971::zeroing {
UnwrapSensor::UnwrapSensor(double sensor_offset, double sensor_range)
: sensor_offset_(sensor_offset), sensor_range_(sensor_range) {
@@ -64,5 +63,4 @@
return remainder(value - nearest, period) + nearest;
}
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing
diff --git a/frc971/zeroing/wrap.h b/frc971/zeroing/wrap.h
index f96b9fb..1d10d58 100644
--- a/frc971/zeroing/wrap.h
+++ b/frc971/zeroing/wrap.h
@@ -1,8 +1,7 @@
#ifndef FRC971_ZEROING_WRAP_H_
#define FRC971_ZEROING_WRAP_H_
-namespace frc971 {
-namespace zeroing {
+namespace frc971::zeroing {
// UnwrapSensor takes in a sensor value from a sensor that loops in a certain
// interval. ex(the sensor moves from 0 to 10 and back to 0 while moving the
@@ -50,7 +49,6 @@
return Wrap(nearest, value, period);
}
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing
#endif // FRC971_ZEROING_WRAP_H_
diff --git a/frc971/zeroing/wrap_test.cc b/frc971/zeroing/wrap_test.cc
index 6597e03..b5d990b 100644
--- a/frc971/zeroing/wrap_test.cc
+++ b/frc971/zeroing/wrap_test.cc
@@ -4,9 +4,7 @@
#include "gtest/gtest.h"
-namespace frc971 {
-namespace zeroing {
-namespace testing {
+namespace frc971::zeroing::testing {
// Tests some various positive and negative values for wrap.
TEST(WrapTest, TestWrap) {
@@ -52,6 +50,4 @@
EXPECT_NEAR(1.0f, Wrap(5.0f, -9.0f, 10.0f), 1e-6f);
}
-} // namespace testing
-} // namespace zeroing
-} // namespace frc971
+} // namespace frc971::zeroing::testing