diff options
| author | Martin Felke <martin.felke@googlemail.com> | 2018-11-25 15:59:28 +0300 |
|---|---|---|
| committer | Martin Felke <martin.felke@googlemail.com> | 2018-11-25 15:59:28 +0300 |
| commit | 028df92b64656cf2b0fd45e78cedbf8f4d295e8b (patch) | |
| tree | cf3c1fcf54278beb0b680157542152a723a57eb4 /extern | |
| parent | 96140b706e043703740b7e61d88a985ee89b563b (diff) | |
removed accidental code merge failures
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h | 5 | ||||
| -rw-r--r-- | extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h | 2 | ||||
| -rw-r--r-- | extern/voro++/CMakeLists.txt | 2 |
4 files changed, 1 insertions, 9 deletions
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index dcc2965d420..5221b0695a0 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -95,7 +95,6 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) add_subdirectory(gflags) endif() add_subdirectory(glog) - endif() if(WITH_GTESTS) diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h index beb6eb3964c..ef2a29202f7 100644 --- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h +++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h @@ -80,11 +80,6 @@ class btUnionFind void unite(int p, int q) { - if (p == -1 && q == -1) { - //error case... should not happen but happens ? - return; - } - int i = find(p), j = find(q); if (i == j) return; diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h index 6ca336b7766..c2f8c5d64ae 100644 --- a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h +++ b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h @@ -183,7 +183,7 @@ public: { //No constraints should point to this rigidbody //Remove constraints from the dynamics world before you delete the related rigidbodies. - // btAssert(m_constraintRefs.size()==0); + btAssert(m_constraintRefs.size()==0); } protected: diff --git a/extern/voro++/CMakeLists.txt b/extern/voro++/CMakeLists.txt index 938f3fc0113..e39f24ba1b1 100644 --- a/extern/voro++/CMakeLists.txt +++ b/extern/voro++/CMakeLists.txt @@ -16,7 +16,6 @@ set (SRC src/unitcell.cc src/v_base.cc src/v_compute.cc -# src/voro++.cc src/wall.cc src/c_interface.cc @@ -31,7 +30,6 @@ set (SRC src/unitcell.hh src/v_base.hh src/v_compute.hh -# src/voro++.hh src/wall.hh src/worklist.hh src/c_interface.hh |