Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-04-22 11:59:15 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-04-22 11:59:15 +0300
commit87dcee0c0c33ab2f2a8d22e0d0b53f0289ef7a46 (patch)
tree9a1558bcb4e624fd1706be9dc460bd5fb0ba50b6 /extern/bullet2
parentd2cb0f955b25857cb4f3fd28ebc4567f997d56b2 (diff)
Silence some annoying warnings when doing full build with strict flags
This mainly touches extern libraries and few debug-only places in intern. Some summary: - External libraries are not strict at all about missing declarations, so we can rather safely remove such warning together with other strict flags. - Bullet has some static functions which are not used. Those were commented out. - Carve now has some unused debug-only functions commented out as well. While we're on the way of getting rid of Carve, it makes sense to make things a bit cleaner for the time being. - In LZMA we have some parts disabled which gives some set but unused variables which is rather correct. - Elbeem had quite some variables set and never used because their usage is inside of debug-only code which is commented out. Note about patching upstream libraries: surely one might say that we have to make local patchset against this, but own experience says it only gives extra work trying to merge such tweaks to a new upstream version and usually it's just faster to re-apply such fixes again after bundling new upstream library.
Diffstat (limited to 'extern/bullet2')
-rw-r--r--extern/bullet2/src/BulletDynamics/Featherstone/btMultiBody.cpp2
-rw-r--r--extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp9
-rw-r--r--extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h4
3 files changed, 9 insertions, 6 deletions
diff --git a/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBody.cpp b/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBody.cpp
index e49cf30d044..aea8c683732 100644
--- a/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBody.cpp
+++ b/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBody.cpp
@@ -51,6 +51,7 @@ namespace {
bottom_out = -displacement.cross(top_out) + rotation_matrix * bottom_in;
}
+/*
void InverseSpatialTransform(const btMatrix3x3 &rotation_matrix,
const btVector3 &displacement,
const btVector3 &top_in,
@@ -80,6 +81,7 @@ namespace {
top_out = a_top.cross(b_top);
bottom_out = a_bottom.cross(b_top) + a_top.cross(b_bottom);
}
+*/
}
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
index 293a393e55e..d96f85ec630 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
@@ -1127,6 +1127,7 @@ int nattrb=0;
int hasbounds=0;
int result = sscanf(node,"%d %d %d %d",&nnode,&ndims,&nattrb,&hasbounds);
result = sscanf(node,"%d %d %d %d",&nnode,&ndims,&nattrb,&hasbounds);
+(void)result;
node += nextLine(node);
pos.resize(nnode);
@@ -1208,10 +1209,10 @@ if(ele&&ele[0])
}
}
}
-printf("Nodes: %u\r\n",psb->m_nodes.size());
-printf("Links: %u\r\n",psb->m_links.size());
-printf("Faces: %u\r\n",psb->m_faces.size());
-printf("Tetras: %u\r\n",psb->m_tetras.size());
+printf("Nodes: %d\r\n",psb->m_nodes.size());
+printf("Links: %d\r\n",psb->m_links.size());
+printf("Faces: %d\r\n",psb->m_faces.size());
+printf("Tetras: %d\r\n",psb->m_tetras.size());
return(psb);
}
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h b/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
index 759509a1d86..1b9d02d79f9 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
@@ -422,7 +422,7 @@ static inline btVector3 BaryCoord( const btVector3& a,
}
//
-static btScalar ImplicitSolve( btSoftBody::ImplicitFn* fn,
+static inline btScalar ImplicitSolve( btSoftBody::ImplicitFn* fn,
const btVector3& a,
const btVector3& b,
const btScalar accuracy,
@@ -504,7 +504,7 @@ static inline btScalar VolumeOf( const btVector3& x0,
}
//
-static void EvaluateMedium( const btSoftBodyWorldInfo* wfi,
+static inline void EvaluateMedium( const btSoftBodyWorldInfo* wfi,
const btVector3& x,
btSoftBody::sMedium& medium)
{