Skip to content

Commit 15feafa

Browse files
rickertmrickertm
committed
Remove extra whitespace required by older compilers
1 parent 30f08e1 commit 15feafa

File tree

7 files changed

+63
-63
lines changed

7 files changed

+63
-63
lines changed

‎src/rl/hal/Ati.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ namespace rl
5757
throw DeviceException("Could not load the desired calibration");
5858
}
5959

60-
this->values.fill(::std::numeric_limits< ::rl::math::Real>::quiet_NaN());
61-
this->voltages.fill(::std::numeric_limits< ::rl::math::Real>::quiet_NaN());
60+
this->values.fill(::std::numeric_limits<::rl::math::Real>::quiet_NaN());
61+
this->voltages.fill(::std::numeric_limits<::rl::math::Real>::quiet_NaN());
6262
}
6363

6464
Ati::~Ati()

‎src/rl/hal/Dc1394Camera.cpp

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ namespace rl
274274
unsigned int width;
275275
unsigned int height;
276276

277-
::dc1394error_t error = ::dc1394_get_image_size_from_video_mode(this->camera, static_cast< ::dc1394video_mode_t>(this->videoMode), &width, &height);
277+
::dc1394error_t error = ::dc1394_get_image_size_from_video_mode(this->camera, static_cast<::dc1394video_mode_t>(this->videoMode), &width, &height);
278278

279279
if (::DC1394_SUCCESS != error)
280280
{
@@ -293,7 +293,7 @@ namespace rl
293293
::dc1394bool_t hasAbsoluteControl;
294294

295295
#if (LIBDC1394_VERSION_MAJOR > 10)
296-
::dc1394error_t error = ::dc1394_feature_has_absolute_control(this->camera, static_cast< ::dc1394feature_t>(feature), &hasAbsoluteControl);
296+
::dc1394error_t error = ::dc1394_feature_has_absolute_control(this->camera, static_cast<::dc1394feature_t>(feature), &hasAbsoluteControl);
297297
#else
298298
int error = ::dc1394_has_absolute_control(this->handle, this->nodes[this->node], feature, &hasAbsoluteControl);
299299
#endif
@@ -310,7 +310,7 @@ namespace rl
310310
Dc1394Camera::getFeatureBoundaries(const Feature& feature, unsigned int& min, unsigned int& max) const
311311
{
312312
#if (LIBDC1394_VERSION_MAJOR > 10)
313-
::dc1394error_t error = ::dc1394_feature_get_boundaries(this->camera, static_cast< ::dc1394feature_t>(feature), &min, &max);
313+
::dc1394error_t error = ::dc1394_feature_get_boundaries(this->camera, static_cast<::dc1394feature_t>(feature), &min, &max);
314314

315315
if (::DC1394_SUCCESS != error)
316316
{
@@ -337,7 +337,7 @@ namespace rl
337337
Dc1394Camera::getFeatureBoundariesAbsolute(const Feature& feature, float& min, float& max) const
338338
{
339339
#if (LIBDC1394_VERSION_MAJOR > 10)
340-
::dc1394error_t error = ::dc1394_feature_get_absolute_boundaries(this->camera, static_cast< ::dc1394feature_t>(feature), &min, &max);
340+
::dc1394error_t error = ::dc1394_feature_get_absolute_boundaries(this->camera, static_cast<::dc1394feature_t>(feature), &min, &max);
341341
#else
342342
int error = ::dc1394_query_absolute_feature_min_max(this->handle, this->nodes[this->node], feature, &min, &max);
343343
#endif
@@ -354,7 +354,7 @@ namespace rl
354354
#if (LIBDC1394_VERSION_MAJOR > 10)
355355
::dc1394feature_mode_t mode;
356356

357-
::dc1394error_t error = ::dc1394_feature_get_mode(this->camera, static_cast< ::dc1394feature_t>(feature), &mode);
357+
::dc1394error_t error = ::dc1394_feature_get_mode(this->camera, static_cast<::dc1394feature_t>(feature), &mode);
358358

359359
if (::DC1394_SUCCESS != error)
360360
{
@@ -401,7 +401,7 @@ namespace rl
401401
#if (LIBDC1394_VERSION_MAJOR > 10)
402402
::dc1394feature_modes_t modes;
403403

404-
::dc1394error_t error = ::dc1394_feature_get_modes(this->camera, static_cast< ::dc1394feature_t>(feature), &modes);
404+
::dc1394error_t error = ::dc1394_feature_get_modes(this->camera, static_cast<::dc1394feature_t>(feature), &modes);
405405

406406
if (::DC1394_SUCCESS != error)
407407
{
@@ -428,21 +428,21 @@ namespace rl
428428
}
429429
}
430430
#else
431-
int error = ::dc1394_has_manual_mode(this->handle, this->nodes[this->node], feature, static_cast< ::dc1394bool_t*>(&hasManual));
431+
int error = ::dc1394_has_manual_mode(this->handle, this->nodes[this->node], feature, static_cast<::dc1394bool_t*>(&hasManual));
432432

433433
if (::DC1394_SUCCESS != error)
434434
{
435435
throw Exception(error);
436436
}
437437

438-
error = ::dc1394_has_auto_mode(this->handle, this->nodes[this->node], feature, stataic_cast< ::dc1394bool_t*>(&hasAuto));
438+
error = ::dc1394_has_auto_mode(this->handle, this->nodes[this->node], feature, static_cast<::dc1394bool_t*>(&hasAuto));
439439

440440
if (::DC1394_SUCCESS != error)
441441
{
442442
throw Exception(error);
443443
}
444444

445-
error = ::dc1394_has_one_push_auto(this->handle, this->nodes[this->node], feature, static_cast< ::dc1394bool_t*>(&hasOnePushAuto));
445+
error = ::dc1394_has_one_push_auto(this->handle, this->nodes[this->node], feature, static_cast<::dc1394bool_t*>(&hasOnePushAuto));
446446

447447
if (::DC1394_SUCCESS != error)
448448
{
@@ -457,7 +457,7 @@ namespace rl
457457
unsigned int value;
458458

459459
#if (LIBDC1394_VERSION_MAJOR > 10)
460-
::dc1394error_t error = ::dc1394_feature_get_value(this->camera, static_cast< ::dc1394feature_t>(feature), &value);
460+
::dc1394error_t error = ::dc1394_feature_get_value(this->camera, static_cast<::dc1394feature_t>(feature), &value);
461461
#else
462462
int error = ::dc1394_get_feature_value(this->handle, this->nodes[this->node], feature, &value);
463463
#endif
@@ -476,7 +476,7 @@ namespace rl
476476
float value;
477477

478478
#if (LIBDC1394_VERSION_MAJOR > 10)
479-
::dc1394error_t error = ::dc1394_feature_get_absolute_value(this->camera, static_cast< ::dc1394feature_t>(feature), &value);
479+
::dc1394error_t error = ::dc1394_feature_get_absolute_value(this->camera, static_cast<::dc1394feature_t>(feature), &value);
480480
#else
481481
int error = ::dc1394_query_absolute_feature_value(this->handle, this->nodes[this->node], feature, &value);
482482
#endif
@@ -510,7 +510,7 @@ namespace rl
510510
Dc1394Camera::getFormat7MaximumImageSize(const unsigned int& mode, unsigned int& width, unsigned& height) const
511511
{
512512
#if (LIBDC1394_VERSION_MAJOR > 10)
513-
::dc1394error_t error = ::dc1394_format7_get_max_image_size(this->camera, static_cast< ::dc1394video_mode_t>(mode), &width, &height);
513+
::dc1394error_t error = ::dc1394_format7_get_max_image_size(this->camera, static_cast<::dc1394video_mode_t>(mode), &width, &height);
514514
#else
515515
int error = ::dc1394_query_format7_max_image_size(this->handle, this->nodes[this->node], mode, &width, &height);
516516
#endif
@@ -527,7 +527,7 @@ namespace rl
527527
Framerate framerate;
528528

529529
#if (LIBDC1394_VERSION_MAJOR > 10)
530-
::dc1394error_t error = ::dc1394_video_get_framerate(this->camera, reinterpret_cast< ::dc1394framerate_t*>(&framerate));
530+
::dc1394error_t error = ::dc1394_video_get_framerate(this->camera, reinterpret_cast<::dc1394framerate_t*>(&framerate));
531531
#else
532532
int error = ::dc1394_get_video_framerate(this->handle, this->nodes[this->node], reinterpret_cast<unsigned int*>(&framerate));
533533
#endif
@@ -558,7 +558,7 @@ namespace rl
558558
OperationMode operationMode;
559559

560560
#if (LIBDC1394_VERSION_MAJOR > 10)
561-
::dc1394error_t error = ::dc1394_video_get_operation_mode(this->camera, reinterpret_cast< ::dc1394operation_mode_t*>(&operationMode));
561+
::dc1394error_t error = ::dc1394_video_get_operation_mode(this->camera, reinterpret_cast<::dc1394operation_mode_t*>(&operationMode));
562562
#else
563563
int error = ::dc1394_get_operation_mode(this->handle, this->nodes[this->node], reinterpret_cast<unsigned int*>(&operationMode));
564564
#endif
@@ -578,7 +578,7 @@ namespace rl
578578
unsigned int width;
579579
unsigned int height;
580580

581-
::dc1394error_t error = ::dc1394_get_image_size_from_video_mode(this->camera, static_cast< ::dc1394video_mode_t>(this->videoMode), &width, &height);
581+
::dc1394error_t error = ::dc1394_get_image_size_from_video_mode(this->camera, static_cast<::dc1394video_mode_t>(this->videoMode), &width, &height);
582582

583583
if (::DC1394_SUCCESS != error)
584584
{
@@ -597,7 +597,7 @@ namespace rl
597597
IsoSpeed speed;
598598

599599
#if (LIBDC1394_VERSION_MAJOR > 10)
600-
::dc1394error_t error = ::dc1394_video_get_iso_speed(this->camera, reinterpret_cast< ::dc1394speed_t*>(&speed));
600+
::dc1394error_t error = ::dc1394_video_get_iso_speed(this->camera, reinterpret_cast<::dc1394speed_t*>(&speed));
601601
#else
602602
unsigned int channel;
603603
int error = ::dc1394_get_iso_channel_and_speed(this->handle, this->nodes[this->node], &channel, reinterpret_cast<unsigned int*>(&speed));
@@ -647,7 +647,7 @@ namespace rl
647647
break;
648648
}
649649

650-
return ::std::chrono::duration_cast< ::std::chrono::nanoseconds>(
650+
return ::std::chrono::duration_cast<::std::chrono::nanoseconds>(
651651
::std::chrono::duration<double>(1.0 / framerate * rl::math::UNIT2NANO)
652652
);
653653
}
@@ -658,7 +658,7 @@ namespace rl
658658
VideoMode videoMode;
659659

660660
#if (LIBDC1394_VERSION_MAJOR > 10)
661-
::dc1394error_t error = ::dc1394_video_get_mode(this->camera, reinterpret_cast< ::dc1394video_mode_t*>(&videoMode));
661+
::dc1394error_t error = ::dc1394_video_get_mode(this->camera, reinterpret_cast<::dc1394video_mode_t*>(&videoMode));
662662
#else
663663
int error = ::dc1394_get_video_mode(this->handle, this->nodes[this->node], reinterpret_cast<unsigned int*>(&videoMode));
664664
#endif
@@ -678,7 +678,7 @@ namespace rl
678678
unsigned int width;
679679
unsigned int height;
680680

681-
::dc1394error_t error = ::dc1394_get_image_size_from_video_mode(this->camera, static_cast< ::dc1394video_mode_t>(this->videoMode), &width, &height);
681+
::dc1394error_t error = ::dc1394_get_image_size_from_video_mode(this->camera, static_cast<::dc1394video_mode_t>(this->videoMode), &width, &height);
682682

683683
if (::DC1394_SUCCESS != error)
684684
{
@@ -735,7 +735,7 @@ namespace rl
735735
::dc1394bool_t hasAbsoluteControl;
736736

737737
#if (LIBDC1394_VERSION_MAJOR > 10)
738-
::dc1394error_t error = ::dc1394_feature_has_absolute_control(this->camera, static_cast< ::dc1394feature_t>(feature), &hasAbsoluteControl);
738+
::dc1394error_t error = ::dc1394_feature_has_absolute_control(this->camera, static_cast<::dc1394feature_t>(feature), &hasAbsoluteControl);
739739
#else
740740
int error = ::dc1394_has_absolute_control(this->handle, this->nodes[this->node], feature, &hasAbsoluteControl);
741741
#endif
@@ -754,7 +754,7 @@ namespace rl
754754
#if (LIBDC1394_VERSION_MAJOR > 10)
755755
::dc1394switch_t isFeatureOn;
756756

757-
::dc1394error_t error = ::dc1394_feature_get_power(this->camera, static_cast< ::dc1394feature_t>(feature), &isFeatureOn);
757+
::dc1394error_t error = ::dc1394_feature_get_power(this->camera, static_cast<::dc1394feature_t>(feature), &isFeatureOn);
758758
#else
759759
::dc1394bool_t isFeatureOn;
760760

@@ -775,7 +775,7 @@ namespace rl
775775
::dc1394bool_t isFeaturePresent;
776776

777777
#if (LIBDC1394_VERSION_MAJOR > 10)
778-
::dc1394error_t error = ::dc1394_feature_is_present(this->camera, static_cast< ::dc1394feature_t>(feature), &isFeaturePresent);
778+
::dc1394error_t error = ::dc1394_feature_is_present(this->camera, static_cast<::dc1394feature_t>(feature), &isFeaturePresent);
779779
#else
780780
int error = ::dc1394_is_feature_present(this->handle, this->nodes[this->node], feature, &isFeaturePresent);
781781
#endif
@@ -794,7 +794,7 @@ namespace rl
794794
::dc1394bool_t canReadOut;
795795

796796
#if (LIBDC1394_VERSION_MAJOR > 10)
797-
::dc1394error_t error = ::dc1394_feature_is_readable(this->camera, static_cast< ::dc1394feature_t>(feature), &canReadOut);
797+
::dc1394error_t error = ::dc1394_feature_is_readable(this->camera, static_cast<::dc1394feature_t>(feature), &canReadOut);
798798
#else
799799
int error = ::dc1394_can_read_out(this->handle, this->nodes[this->node], feature, &canReadOut);
800800
#endif
@@ -813,7 +813,7 @@ namespace rl
813813
::dc1394bool_t canTurnOnOff;
814814

815815
#if (LIBDC1394_VERSION_MAJOR > 10)
816-
::dc1394error_t error = ::dc1394_feature_is_switchable(this->camera, static_cast< ::dc1394feature_t>(feature), &canTurnOnOff);
816+
::dc1394error_t error = ::dc1394_feature_is_switchable(this->camera, static_cast<::dc1394feature_t>(feature), &canTurnOnOff);
817817
#else
818818
int error = ::dc1394_can_turn_on_off(this->handle, this->nodes[this->node], feature, &canTurnOnOff);
819819
#endif
@@ -873,14 +873,14 @@ namespace rl
873873
throw Exception(error);
874874
}
875875

876-
error = ::dc1394_get_video_framerate(this->handle, this->nodes[this->node], static_cast< ::dc1394framerate_t*>(&this->framerate));
876+
error = ::dc1394_get_video_framerate(this->handle, this->nodes[this->node], static_cast<::dc1394framerate_t*>(&this->framerate));
877877

878878
if (::DC1394_SUCCESS != error)
879879
{
880880
throw Exception(error);
881881
}
882882

883-
error = ::dc1394_get_video_mode(this->handle, this->nodes[this->node], static_cast< ::dc1394video_mode_t*>(&this->videoMode));
883+
error = ::dc1394_get_video_mode(this->handle, this->nodes[this->node], static_cast<::dc1394video_mode_t*>(&this->videoMode));
884884

885885
if (::DC1394_SUCCESS != error)
886886
{
@@ -922,7 +922,7 @@ namespace rl
922922
Dc1394Camera::setFeatureEnabled(const Feature& feature, const bool& doOn)
923923
{
924924
#if (LIBDC1394_VERSION_MAJOR > 10)
925-
::dc1394error_t error = ::dc1394_feature_set_power(this->camera, static_cast< ::dc1394feature_t>(feature), static_cast< ::dc1394switch_t>(doOn));
925+
::dc1394error_t error = ::dc1394_feature_set_power(this->camera, static_cast<::dc1394feature_t>(feature), static_cast<::dc1394switch_t>(doOn));
926926
#else
927927
int error = ::dc1394_feature_on_off(this->handle, this->nodes[this->node], feature, doOn);
928928
#endif
@@ -937,7 +937,7 @@ namespace rl
937937
Dc1394Camera::setFeatureMode(const Feature& feature, const FeatureMode& mode)
938938
{
939939
#if (LIBDC1394_VERSION_MAJOR > 10)
940-
::dc1394error_t error = ::dc1394_feature_set_mode(this->camera, static_cast< ::dc1394feature_t>(feature), static_cast< ::dc1394feature_mode_t>(mode));
940+
::dc1394error_t error = ::dc1394_feature_set_mode(this->camera, static_cast<::dc1394feature_t>(feature), static_cast<::dc1394feature_mode_t>(mode));
941941
#else
942942
int error;
943943

@@ -967,7 +967,7 @@ namespace rl
967967
Dc1394Camera::setFeatureValue(const Feature& feature, const unsigned int& value)
968968
{
969969
#if (LIBDC1394_VERSION_MAJOR > 10)
970-
::dc1394error_t error = ::dc1394_feature_set_value(this->camera, static_cast< ::dc1394feature_t>(feature), value);
970+
::dc1394error_t error = ::dc1394_feature_set_value(this->camera, static_cast<::dc1394feature_t>(feature), value);
971971
#else
972972
int error = ::dc1394_set_feature_value(this->handle, this->nodes[this->node], feature, value);
973973
#endif
@@ -982,7 +982,7 @@ namespace rl
982982
Dc1394Camera::setFeatureValueAbsolute(const Feature& feature, const float& value)
983983
{
984984
#if (LIBDC1394_VERSION_MAJOR > 10)
985-
::dc1394error_t error = ::dc1394_feature_set_absolute_value(this->camera, static_cast< ::dc1394feature_t>(feature), value);
985+
::dc1394error_t error = ::dc1394_feature_set_absolute_value(this->camera, static_cast<::dc1394feature_t>(feature), value);
986986
#else
987987
int error = ::dc1394_set_absolute_feature_value(this->handle, this->nodes[this->node], feature, value);
988988
#endif
@@ -1005,8 +1005,8 @@ namespace rl
10051005
#if (LIBDC1394_VERSION_MAJOR > 10)
10061006
::dc1394error_t error = ::dc1394_format7_set_roi(
10071007
this->camera,
1008-
static_cast< ::dc1394video_mode_t>(videoMode),
1009-
static_cast< ::dc1394color_coding_t>(colorCoding),
1008+
static_cast<::dc1394video_mode_t>(videoMode),
1009+
static_cast<::dc1394color_coding_t>(colorCoding),
10101010
DC1394_QUERY_FROM_CAMERA,
10111011
left,
10121012
top,
@@ -1032,7 +1032,7 @@ namespace rl
10321032
Dc1394Camera::setFramerate(const Framerate& framerate)
10331033
{
10341034
#if (LIBDC1394_VERSION_MAJOR > 10)
1035-
::dc1394error_t error = ::dc1394_video_set_framerate(this->camera, static_cast< ::dc1394framerate_t>(framerate));
1035+
::dc1394error_t error = ::dc1394_video_set_framerate(this->camera, static_cast<::dc1394framerate_t>(framerate));
10361036
#else
10371037
int error = ::dc1394_set_video_framerate(this->handle, this->nodes[node], framerate);
10381038
#endif
@@ -1055,7 +1055,7 @@ namespace rl
10551055
Dc1394Camera::setOperationMode(const OperationMode& mode)
10561056
{
10571057
#if (LIBDC1394_VERSION_MAJOR > 10)
1058-
::dc1394error_t error = ::dc1394_video_set_operation_mode(this->camera, static_cast< ::dc1394operation_mode_t>(mode));
1058+
::dc1394error_t error = ::dc1394_video_set_operation_mode(this->camera, static_cast<::dc1394operation_mode_t>(mode));
10591059
#else
10601060
int error = ::dc1394_set_operation_mode(this->handle, this->nodes[this->node], mode);
10611061
#endif
@@ -1070,7 +1070,7 @@ namespace rl
10701070
Dc1394Camera::setSpeed(const IsoSpeed& speed)
10711071
{
10721072
#if (LIBDC1394_VERSION_MAJOR > 10)
1073-
::dc1394error_t error = ::dc1394_video_set_iso_speed(this->camera, static_cast< ::dc1394speed_t>(speed));
1073+
::dc1394error_t error = ::dc1394_video_set_iso_speed(this->camera, static_cast<::dc1394speed_t>(speed));
10741074
#else
10751075
int error = ::dc1394_set_iso_channel_and_speed(this->handle, this->nodes[node], this->channel, speed);
10761076
#endif
@@ -1087,7 +1087,7 @@ namespace rl
10871087
Dc1394Camera::setVideoMode(const VideoMode& videoMode)
10881088
{
10891089
#if (LIBDC1394_VERSION_MAJOR > 10)
1090-
::dc1394error_t error = ::dc1394_video_set_mode(this->camera, static_cast< ::dc1394video_mode_t>(videoMode));
1090+
::dc1394error_t error = ::dc1394_video_set_mode(this->camera, static_cast<::dc1394video_mode_t>(videoMode));
10911091
#else
10921092
unsigned int format;
10931093

‎src/rl/hal/Jr3.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace rl
4141
values(),
4242
zeroes()
4343
{
44-
this->values.fill(::std::numeric_limits< ::rl::math::Real>::quiet_NaN());
44+
this->values.fill(::std::numeric_limits<::rl::math::Real>::quiet_NaN());
4545
this->zeroes.fill(0);
4646
}
4747

‎src/rl/sg/UrdfFactory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ ::std::cout << "root: " << name << ::std::endl;
185185
}
186186
}
187187

188-
::std::deque< ::std::string> dfs;
188+
::std::deque<::std::string> dfs;
189189
dfs.push_front(root);
190190

191191
while (!dfs.empty())

‎src/rl/sg/fcl/Model.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ namespace rl
5656
Model::add(Body* body)
5757
{
5858
this->bodies.push_back(body);
59-
::std::vector< ::fcl::CollisionObject*> objects;
59+
::std::vector<::fcl::CollisionObject*> objects;
6060
body->manager.getObjects(objects);
6161

6262
if (objects.size() > 0)
@@ -87,7 +87,7 @@ namespace rl
8787
if (found != this->bodies.end())
8888
{
8989
this->bodies.erase(found);
90-
::std::vector< ::fcl::CollisionObject*> objects;
90+
::std::vector<::fcl::CollisionObject*> objects;
9191
body->manager.getObjects(objects);
9292

9393
for (::std::size_t i = 0; i < objects.size(); ++i)

‎src/rl/sg/fcl/Scene.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ namespace rl
6464
{
6565
Model* modelFcl = static_cast<Model*>(model);
6666
this->models.push_back(model);
67-
::std::vector< ::fcl::CollisionObject*> objects;
67+
::std::vector<::fcl::CollisionObject*> objects;
6868
modelFcl->manager.getObjects(objects);
6969

7070
if (objects.size() > 0)
@@ -281,15 +281,15 @@ namespace rl
281281
Scene::distance(::rl::sg::Shape* shape, const ::rl::math::Vector3& point, ::rl::math::Vector3& point1, ::rl::math::Vector3& point2)
282282
{
283283
#if FCL_MAJOR_VERSION < 1 && FCL_MINOR_VERSION < 5
284-
::boost::shared_ptr< ::fcl::CollisionGeometry> geometry = ::boost::make_shared< ::fcl::Sphere>(0);
284+
::boost::shared_ptr<::fcl::CollisionGeometry> geometry = ::boost::make_shared<::fcl::Sphere>(0);
285285
#else
286-
::std::shared_ptr< ::fcl::CollisionGeometry> geometry = ::std::make_shared< ::fcl::Sphere>(0);
286+
::std::shared_ptr<::fcl::CollisionGeometry> geometry = ::std::make_shared<::fcl::Sphere>(0);
287287
#endif
288288
::fcl::Vec3f translation(point(0), point(1), point(2));
289289
#if FCL_MAJOR_VERSION < 1 && FCL_MINOR_VERSION < 5
290-
::boost::shared_ptr< ::fcl::CollisionObject> collisionObject = ::boost::make_shared< ::fcl::CollisionObject>(geometry, ::fcl::Transform3f(translation));
290+
::boost::shared_ptr<::fcl::CollisionObject> collisionObject = ::boost::make_shared<::fcl::CollisionObject>(geometry, ::fcl::Transform3f(translation));
291291
#else
292-
::std::shared_ptr< ::fcl::CollisionObject> collisionObject = ::std::make_shared< ::fcl::CollisionObject>(geometry, ::fcl::Transform3f(translation));
292+
::std::shared_ptr<::fcl::CollisionObject> collisionObject = ::std::make_shared<::fcl::CollisionObject>(geometry, ::fcl::Transform3f(translation));
293293
#endif
294294

295295
::fcl::DistanceRequest request;
@@ -331,7 +331,7 @@ namespace rl
331331
if (found != this->models.end())
332332
{
333333
this->models.erase(found);
334-
::std::vector< ::fcl::CollisionObject*> objects;
334+
::std::vector<::fcl::CollisionObject*> objects;
335335
static_cast<Model*>(model)->manager.getObjects(objects);
336336

337337
for (::std::size_t i = 0; i < objects.size(); ++i)

0 commit comments

Comments
 (0)