Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
coal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Coal
coal
Commits
1770ce1c
Verified
Commit
1770ce1c
authored
5 years ago
by
Justin Carpentier
Browse files
Options
Downloads
Patches
Plain Diff
core: remove throw from function declarations
This is for making the code compliant with new policy in C++17.
parent
4011a907
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/hpp/fcl/mesh_loader/assimp.h
+2
-2
2 additions, 2 deletions
include/hpp/fcl/mesh_loader/assimp.h
with
2 additions
and
2 deletions
include/hpp/fcl/mesh_loader/assimp.h
+
2
−
2
View file @
1770ce1c
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment