Commit 1b2ff9f5 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

Merge tag 'v1.0.1'

Release of version 1.0.1.
parents f0364b8d 6531987e
Pipeline #3535 passed with stage
in 95 minutes and 12 seconds
language: cpp
env:
- BUILD_TYPE=Debug
- BUILD_TYPE=Release
global:
- CTEST_PARALLEL_LEVEL=4
matrix:
- BUILD_TYPE=Debug
- BUILD_TYPE=Release
matrix:
include:
......@@ -32,7 +35,7 @@ script:
- make -j4
# Run unit tests
- make test
- travis_wait 30 make test || travis_wait 30 ctest -VV
# Make sure we can install and uninstall with no issues
- sudo make -j4 install
......
......@@ -170,4 +170,4 @@ IF(HPP_FCL_HAVE_OCTOMAP)
"-DHPP_FCL_HAVE_OCTOMAP -DFCL_HAVE_OCTOMAP -DOCTOMAP_MAJOR_VERSION=${OCTOMAP_MAJOR_VERSION} -DOCTOMAP_MINOR_VERSION=${OCTOMAP_MINOR_VERSION} -DOCTOMAP_PATCH_VERSION=${OCTOMAP_PATCH_VERSION}")
ENDIF(HPP_FCL_HAVE_OCTOMAP)
setup_project_finalize()
setup_hpp_project_finalize()
......@@ -77,6 +77,8 @@ namespace fcl {
Key (const std::string& f, const Vec3f& s, const NODE_TYPE& t)
: filename (f), scale (s), bvType (t) {}
bool operator< (const CachedMeshLoader::Key& b) const;
};
typedef std::map <Key, CollisionGeometryPtr_t> Cache_t;
......
......@@ -42,8 +42,9 @@
namespace hpp
{
namespace fcl {
bool operator< (const CachedMeshLoader::Key& a, const CachedMeshLoader::Key& b)
bool CachedMeshLoader::Key::operator< (const CachedMeshLoader::Key& b) const
{
const CachedMeshLoader::Key& a = *this;
if (a.bvType < b.bvType) return true;
if (a.bvType > b.bvType) return false;
for (int i = 0; i < 3; ++i) {
......
Supports Markdown
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