update Bullet 2.x with latest changes, notice that the integration is not finished...
[blender.git] / extern / bullet2 / src / BulletCollision / CollisionDispatch / btUnionFind.h
index 8db1580e41eb6dc482099e38b40f31218c1d91ac..b1baca9ff156cb856dc99d27992e66162b28e656 100644 (file)
@@ -45,7 +45,7 @@ class btUnionFind
 
          inline int    getNumElements() const
          {
-                 return m_elements.size();
+                 return int(m_elements.size());
          }
          inline bool  isRoot(int x) const
          {