Skip to content
Snippets Groups Projects
Unverified Commit c83a604f authored by Joseph Mirabel's avatar Joseph Mirabel Committed by GitHub
Browse files

Merge pull request #73 from jcarpent/devel 

core: remove throw from function declarations
parents 4011a907 1770ce1c
No related branches found
No related tags found
No related merge requests found
Pipeline #6907 passed with warnings
Stage: test
Hide whitespace changes
Inline Side-by-side
include/hpp/fcl/mesh_loader/assimp.h
+ 2
− 2
View file @ c83a604f
...@@ -95,7 +95,7 @@ template<class BoundingVolume> ...@@ -95,7 +95,7 @@ template<class BoundingVolume>
inline void meshFromAssimpScene(const std::string & name, inline void meshFromAssimpScene(const std::string & name,
const fcl::Vec3f & scale, const fcl::Vec3f & scale,
const aiScene* scene, const aiScene* scene,
const boost::shared_ptr < BVHModel<BoundingVolume> > & mesh) throw (std::invalid_argument) const boost::shared_ptr < BVHModel<BoundingVolume> > & mesh)
{ {
TriangleAndVertices tv; TriangleAndVertices tv;
...@@ -128,7 +128,7 @@ inline void meshFromAssimpScene(const std::string & name, ...@@ -128,7 +128,7 @@ inline void meshFromAssimpScene(const std::string & name,
template<class BoundingVolume> template<class BoundingVolume>
inline void loadPolyhedronFromResource (const std::string & resource_path, inline void loadPolyhedronFromResource (const std::string & resource_path,
const fcl::Vec3f & scale, const fcl::Vec3f & scale,
const boost::shared_ptr < BVHModel<BoundingVolume> > & polyhedron) throw (std::invalid_argument) const boost::shared_ptr < BVHModel<BoundingVolume> > & polyhedron)
{ {
Assimp::Importer importer; Assimp::Importer importer;
// set list of ignored parameters (parameters used for rendering) // set list of ignored parameters (parameters used for rendering)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment