From 35eb90c135eba994a2ca2cbd50a68c367910f4b6 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Fri, 21 Feb 2020 00:41:50 -0800 Subject: [PATCH] Fix "'dimensionless' ambiguous symbol" error (#2382) A typedef for units::dimensionless::dimensionless is defined, which conflicted with the namespace when we added "using namespace dimensionless". This patch reverts the "using namespace" directive. "using" directives were added to pull three of the four relevant typedefs but avoid the "dimensionless" type conflict. This issue was first introduced in #2301. --- wpiutil/src/main/native/include/units/units.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wpiutil/src/main/native/include/units/units.h b/wpiutil/src/main/native/include/units/units.h index ea9ce825ee..c5b855f8ed 100644 --- a/wpiutil/src/main/native/include/units/units.h +++ b/wpiutil/src/main/native/include/units/units.h @@ -4854,5 +4854,8 @@ using namespace velocity; using namespace acceleration; using namespace angle; using namespace voltage; -using namespace dimensionless; + +using dimensionless::scalar; +using dimensionless::scalar_t; +using dimensionless::dimensionless_t; } // namespace units