summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeandro Dorileo <dorileo@profusion.mobi>2013-01-04 01:21:07 +0000
committerLeandro Dorileo <dorileo@profusion.mobi>2013-01-04 01:21:07 +0000
commitf97e2750e412ff51610ec611632e91cea6f216d0 (patch)
tree1517f65a6d552720834a6066ec865b519e0fb256
parent6b254942f14b8aec29c2885c13b45b16070cf6b9 (diff)
Ephysics: get rid of shadow warnings
Get rid of -Wshadow warnings on bullet's C++ "shadowed" variables. SVN revision: 82136
-rw-r--r--src/lib/ephysics/ephysics_body.cpp6
-rw-r--r--src/lib/ephysics/ephysics_private.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/ephysics/ephysics_body.cpp b/src/lib/ephysics/ephysics_body.cpp
index eddfbfb..43a6d27 100644
--- a/src/lib/ephysics/ephysics_body.cpp
+++ b/src/lib/ephysics/ephysics_body.cpp
@@ -4,9 +4,15 @@
4 4
5#include <Evas.h> 5#include <Evas.h>
6#include <Ecore.h> 6#include <Ecore.h>
7
8#pragma GCC diagnostic push
9#pragma GCC diagnostic ignored "-Wshadow"
10
7#include <BulletCollision/CollisionShapes/btShapeHull.h> 11#include <BulletCollision/CollisionShapes/btShapeHull.h>
8#include <LinearMath/btGeometryUtil.h> 12#include <LinearMath/btGeometryUtil.h>
9 13
14#pragma GCC diagnostic pop
15
10#include <math.h> 16#include <math.h>
11 17
12#include "ephysics_private.h" 18#include "ephysics_private.h"
diff --git a/src/lib/ephysics/ephysics_private.h b/src/lib/ephysics/ephysics_private.h
index 1f888ca..36ece8c 100644
--- a/src/lib/ephysics/ephysics_private.h
+++ b/src/lib/ephysics/ephysics_private.h
@@ -7,6 +7,7 @@
7 7
8#pragma GCC diagnostic push 8#pragma GCC diagnostic push
9#pragma GCC diagnostic ignored "-Wunused-parameter" 9#pragma GCC diagnostic ignored "-Wunused-parameter"
10#pragma GCC diagnostic ignored "-Wshadow"
10 11
11#include <BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h> 12#include <BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h>
12#include <BulletSoftBody/btDefaultSoftBodySolver.h> 13#include <BulletSoftBody/btDefaultSoftBodySolver.h>