Skip to content

Commit d1ae55b

Browse files
committed
Remove redunant namespace references
Signed-off-by: methylDragon <methylDragon@gmail.com>
1 parent 1715173 commit d1ae55b

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

src/PointCloudPackedUtils_TEST.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,17 +125,17 @@ TEST(PointCloudPackedUtilsTest, MultipleFields)
125125

126126
EXPECT_EQ("x", pcMsg.field(0).name());
127127
EXPECT_EQ(0u, pcMsg.field(0).offset());
128-
EXPECT_EQ(msgs::PointCloudPacked::Field::INT8, pcMsg.field(0).datatype());
128+
EXPECT_EQ(PointCloudPacked::Field::INT8, pcMsg.field(0).datatype());
129129
EXPECT_EQ(1u, pcMsg.field(0).count());
130130

131131
EXPECT_EQ("y", pcMsg.field(1).name());
132132
EXPECT_EQ(1u, pcMsg.field(1).offset());
133-
EXPECT_EQ(msgs::PointCloudPacked::Field::UINT8, pcMsg.field(1).datatype());
133+
EXPECT_EQ(PointCloudPacked::Field::UINT8, pcMsg.field(1).datatype());
134134
EXPECT_EQ(1u, pcMsg.field(1).count());
135135

136136
EXPECT_EQ("z", pcMsg.field(2).name());
137137
EXPECT_EQ(2u, pcMsg.field(2).offset());
138-
EXPECT_EQ(msgs::PointCloudPacked::Field::INT16, pcMsg.field(2).datatype());
138+
EXPECT_EQ(PointCloudPacked::Field::INT16, pcMsg.field(2).datatype());
139139
EXPECT_EQ(1u, pcMsg.field(2).count());
140140

141141
// Reserve space for data
@@ -237,9 +237,9 @@ TEST(PointCloudPackedUtilsTest, XYZRGBA)
237237
{
238238
PointCloudPacked pcMsg;
239239

240-
msgs::InitPointCloudPacked(pcMsg, "my_frame", true,
241-
{{"xyz", msgs::PointCloudPacked::Field::FLOAT32},
242-
{"rgba", msgs::PointCloudPacked::Field::FLOAT32}});
240+
InitPointCloudPacked(pcMsg, "my_frame", true,
241+
{{"xyz", PointCloudPacked::Field::FLOAT32},
242+
{"rgba", PointCloudPacked::Field::FLOAT32}});
243243

244244
// Reserve space for data
245245
unsigned int total{5 * pcMsg.point_step()};

src/Utility_TEST.cc

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,12 @@ TEST(UtilityTest, ConvertMsgsPlaneToMath)
178178
/////////////////////////////////////////////////
179179
TEST(MsgsTest, ConvertMathInertialToMsgs)
180180
{
181-
const auto pose = ignition::math::Pose3d(5, 6, 7, 0.4, 0.5, 0.6);
181+
const auto pose = math::Pose3d(5, 6, 7, 0.4, 0.5, 0.6);
182182
msgs::Inertial msg = msgs::Convert(
183-
ignition::math::Inertiald(
184-
ignition::math::MassMatrix3d(12.0,
185-
ignition::math::Vector3d(2, 3, 4),
186-
ignition::math::Vector3d(0.1, 0.2, 0.3)),
183+
math::Inertiald(
184+
math::MassMatrix3d(12.0,
185+
math::Vector3d(2, 3, 4),
186+
math::Vector3d(0.1, 0.2, 0.3)),
187187
pose));
188188

189189
EXPECT_DOUBLE_EQ(12.0, msg.mass());
@@ -199,12 +199,12 @@ TEST(MsgsTest, ConvertMathInertialToMsgs)
199199
/////////////////////////////////////////////////
200200
TEST(MsgsTest, ConvertMsgsInertialToMath)
201201
{
202-
const auto pose = ignition::math::Pose3d(5, 6, 7, 0.4, 0.5, 0.6);
202+
const auto pose = math::Pose3d(5, 6, 7, 0.4, 0.5, 0.6);
203203
msgs::Inertial msg = msgs::Convert(
204-
ignition::math::Inertiald(
205-
ignition::math::MassMatrix3d(12.0,
206-
ignition::math::Vector3d(2, 3, 4),
207-
ignition::math::Vector3d(0.1, 0.2, 0.3)),
204+
math::Inertiald(
205+
math::MassMatrix3d(12.0,
206+
math::Vector3d(2, 3, 4),
207+
math::Vector3d(0.1, 0.2, 0.3)),
208208
pose));
209209
auto inertial = msgs::Convert(msg);
210210

@@ -222,9 +222,9 @@ TEST(MsgsTest, ConvertMsgsInertialToMath)
222222
TEST(MsgsTest, ConvertMathMassMatrix3ToMsgs)
223223
{
224224
msgs::Inertial msg = msgs::Convert(
225-
ignition::math::MassMatrix3d(12.0,
226-
ignition::math::Vector3d(2, 3, 4),
227-
ignition::math::Vector3d(0.1, 0.2, 0.3)));
225+
math::MassMatrix3d(12.0,
226+
math::Vector3d(2, 3, 4),
227+
math::Vector3d(0.1, 0.2, 0.3)));
228228

229229
EXPECT_DOUBLE_EQ(12.0, msg.mass());
230230
EXPECT_DOUBLE_EQ(2.0, msg.ixx());
@@ -233,7 +233,7 @@ TEST(MsgsTest, ConvertMathMassMatrix3ToMsgs)
233233
EXPECT_DOUBLE_EQ(0.1, msg.ixy());
234234
EXPECT_DOUBLE_EQ(0.2, msg.ixz());
235235
EXPECT_DOUBLE_EQ(0.3, msg.iyz());
236-
EXPECT_EQ(ignition::math::Pose3d::Zero, msgs::Convert(msg.pose()));
236+
EXPECT_EQ(math::Pose3d::Zero, msgs::Convert(msg.pose()));
237237
}
238238

239239
/////////////////////////////////////////////////
@@ -522,13 +522,13 @@ TEST(UtilityTest, SetPlane)
522522
/////////////////////////////////////////////////
523523
TEST(MsgsTest, SetInertial)
524524
{
525-
const auto pose = ignition::math::Pose3d(5, 6, 7, 0.4, 0.5, 0.6);
525+
const auto pose = math::Pose3d(5, 6, 7, 0.4, 0.5, 0.6);
526526
msgs::Inertial msg;
527-
msgs::Set(&msg, ignition::math::Inertiald(
528-
ignition::math::MassMatrix3d(
527+
msgs::Set(&msg, math::Inertiald(
528+
math::MassMatrix3d(
529529
12.0,
530-
ignition::math::Vector3d(2, 3, 4),
531-
ignition::math::Vector3d(0.1, 0.2, 0.3)),
530+
math::Vector3d(2, 3, 4),
531+
math::Vector3d(0.1, 0.2, 0.3)),
532532
pose));
533533

534534
EXPECT_DOUBLE_EQ(12.0, msg.mass());
@@ -545,10 +545,10 @@ TEST(MsgsTest, SetInertial)
545545
TEST(MsgsTest, SetMassMatrix3)
546546
{
547547
msgs::Inertial msg;
548-
msgs::Set(&msg, ignition::math::MassMatrix3d(
548+
msgs::Set(&msg, math::MassMatrix3d(
549549
12.0,
550-
ignition::math::Vector3d(2, 3, 4),
551-
ignition::math::Vector3d(0.1, 0.2, 0.3)));
550+
math::Vector3d(2, 3, 4),
551+
math::Vector3d(0.1, 0.2, 0.3)));
552552

553553
EXPECT_DOUBLE_EQ(12.0, msg.mass());
554554
EXPECT_DOUBLE_EQ(2.0, msg.ixx());
@@ -557,7 +557,7 @@ TEST(MsgsTest, SetMassMatrix3)
557557
EXPECT_DOUBLE_EQ(0.1, msg.ixy());
558558
EXPECT_DOUBLE_EQ(0.2, msg.ixz());
559559
EXPECT_DOUBLE_EQ(0.3, msg.iyz());
560-
EXPECT_EQ(ignition::math::Pose3d::Zero, msgs::Convert(msg.pose()));
560+
EXPECT_EQ(math::Pose3d::Zero, msgs::Convert(msg.pose()));
561561
}
562562

563563
/////////////////////////////////////////////////

src/ign.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void cmdMsgInfo(const char *_msg)
4747
{
4848
if (_msg)
4949
{
50-
auto msg = ignition::msgs::Factory::New(_msg);
50+
auto msg = Factory::New(_msg);
5151
if (msg)
5252
{
5353
auto descriptor = msg->GetDescriptor();
@@ -71,7 +71,7 @@ extern "C" IGNITION_MSGS_VISIBLE
7171
void cmdMsgList()
7272
{
7373
std::vector<std::string> types;
74-
ignition::msgs::Factory::Types(types);
74+
Factory::Types(types);
7575

7676
for (auto const &type : types)
7777
std::cout << type << std::endl;

0 commit comments

Comments
 (0)