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
Tags v1.1.3
No related merge requests found
Pipeline #6764 passed with warnings
......@@ -95,7 +95,7 @@ template<class BoundingVolume>
inline void meshFromAssimpScene(const std::string & name,
const fcl::Vec3f & scale,
const aiScene* scene,
const boost::shared_ptr < BVHModel<BoundingVolume> > & mesh) throw (std::invalid_argument)
const boost::shared_ptr < BVHModel<BoundingVolume> > & mesh)
{
TriangleAndVertices tv;
......@@ -128,7 +128,7 @@ inline void meshFromAssimpScene(const std::string & name,
template<class BoundingVolume>
inline void loadPolyhedronFromResource (const std::string & resource_path,
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;
// set list of ignored parameters (parameters used for rendering)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment