Skip to content

Commit

Permalink
Clange format
Browse files Browse the repository at this point in the history
  • Loading branch information
Levi-Armstrong committed Sep 25, 2019
1 parent af9e7cd commit d6397ad
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
8 changes: 4 additions & 4 deletions tesseract/tesseract_urdf/include/tesseract_urdf/material.h
Original file line number Diff line number Diff line change
Expand Up @@ -179,14 +179,14 @@ parse(tesseract_scene_graph::Material::Ptr& material,
{
auto it = available_materials.find(material_name);
if (it != available_materials.end())
return std::make_shared<tesseract_common::StatusCode>(MaterialStatusCategory::ErrorMultipleMaterialsWithSameName,
status_cat);
return std::make_shared<tesseract_common::StatusCode>(
MaterialStatusCategory::ErrorMultipleMaterialsWithSameName, status_cat);
available_materials[material_name] = m;
}
else if (!allow_anonymous)
{
return std::make_shared<tesseract_common::StatusCode>(MaterialStatusCategory::ErrorAnonymousMaterialNamesNotAllowed,
status_cat);
return std::make_shared<tesseract_common::StatusCode>(
MaterialStatusCategory::ErrorAnonymousMaterialNamesNotAllowed, status_cat);
}
}

Expand Down
3 changes: 1 addition & 2 deletions tesseract/tesseract_urdf/include/tesseract_urdf/octomap.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,9 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
#include <tesseract_urdf/octree.h>

#ifdef TESSERACT_PARSE_POINT_CLOUDS
#include <tesseract_urdf/point_cloud.h>
#include <tesseract_urdf/point_cloud.h>
#endif


namespace tesseract_urdf
{
class OctomapStatusCategory : public tesseract_common::StatusCategory
Expand Down

0 comments on commit d6397ad

Please sign in to comment.