Merge pull request #58 from jmirabel/devel

Declare CachedMeshLoader::Key::operator<

include/hpp/fcl/mesh_loader/loader.h

@@ -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;
 

src/mesh_loader/loader.cpp

@@ -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) {