From 70eddd78a7c84187ce9fc646fa16666540a8842d Mon Sep 17 00:00:00 2001
From: "nor..67" <normen667@gmail.com>
Date: Sat, 29 Jun 2013 18:23:38 +0000
Subject: [PATCH] - fix native bullet compiler error

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10680 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 .../bullet-native/com_jme3_bullet_PhysicsSpace.h    |  2 --
 .../com_jme3_bullet_PhysicsSpace_BroadphaseType.h   | 13 +++++++++++++
 engine/src/bullet-native/jmeBulletUtil.cpp          |  2 +-
 engine/src/bullet-native/jmeBulletUtil.h            |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 engine/src/bullet-native/com_jme3_bullet_PhysicsSpace_BroadphaseType.h

diff --git a/engine/src/bullet-native/com_jme3_bullet_PhysicsSpace.h b/engine/src/bullet-native/com_jme3_bullet_PhysicsSpace.h
index bc5762dcc..8eb2f34de 100644
--- a/engine/src/bullet-native/com_jme3_bullet_PhysicsSpace.h
+++ b/engine/src/bullet-native/com_jme3_bullet_PhysicsSpace.h
@@ -13,8 +13,6 @@ extern "C" {
 #define com_jme3_bullet_PhysicsSpace_AXIS_Y 1L
 #undef com_jme3_bullet_PhysicsSpace_AXIS_Z
 #define com_jme3_bullet_PhysicsSpace_AXIS_Z 2L
-/* Inaccessible static: pQueueTL */
-/* Inaccessible static: physicsSpaceTL */
 /*
  * Class:     com_jme3_bullet_PhysicsSpace
  * Method:    createPhysicsSpace
diff --git a/engine/src/bullet-native/com_jme3_bullet_PhysicsSpace_BroadphaseType.h b/engine/src/bullet-native/com_jme3_bullet_PhysicsSpace_BroadphaseType.h
new file mode 100644
index 000000000..04eb0f45f
--- /dev/null
+++ b/engine/src/bullet-native/com_jme3_bullet_PhysicsSpace_BroadphaseType.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_jme3_bullet_PhysicsSpace_BroadphaseType */
+
+#ifndef _Included_com_jme3_bullet_PhysicsSpace_BroadphaseType
+#define _Included_com_jme3_bullet_PhysicsSpace_BroadphaseType
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/engine/src/bullet-native/jmeBulletUtil.cpp b/engine/src/bullet-native/jmeBulletUtil.cpp
index e6f085ceb..b584b83c0 100644
--- a/engine/src/bullet-native/jmeBulletUtil.cpp
+++ b/engine/src/bullet-native/jmeBulletUtil.cpp
@@ -307,7 +307,7 @@ void jmeBulletUtil::convertQuat(JNIEnv* env, const btMatrix3x3* in, jobject out)
     }
 }
 
-void jmeBulletUtil::addResult(JNIEnv* env, jobject resultlist, btVector3 hitnormal, btVector3 m_hitPointWorld, btScalar m_hitFraction, btCollisionObject* hitobject) {
+void jmeBulletUtil::addResult(JNIEnv* env, jobject resultlist, btVector3 hitnormal, btVector3 m_hitPointWorld, btScalar m_hitFraction, const btCollisionObject* hitobject) {
 
     jobject singleresult = env->AllocObject(jmeClasses::PhysicsRay_Class);
     jobject hitnormalvec = env->AllocObject(jmeClasses::Vector3f);
diff --git a/engine/src/bullet-native/jmeBulletUtil.h b/engine/src/bullet-native/jmeBulletUtil.h
index ab7bea360..9ec758201 100644
--- a/engine/src/bullet-native/jmeBulletUtil.h
+++ b/engine/src/bullet-native/jmeBulletUtil.h
@@ -45,7 +45,7 @@ public:
     static void convert(JNIEnv* env, const btMatrix3x3* in, jobject out);
     static void convertQuat(JNIEnv* env, jobject in, btMatrix3x3* out);
     static void convertQuat(JNIEnv* env, const btMatrix3x3* in, jobject out);
-    static void addResult(JNIEnv* env, jobject resultlist, const btVector3 hitnormal,const btVector3 m_hitPointWorld,const btScalar  m_hitFraction,btCollisionObject* hitobject);
+    static void addResult(JNIEnv* env, jobject resultlist, const btVector3 hitnormal,const btVector3 m_hitPointWorld,const btScalar  m_hitFraction,const btCollisionObject* hitobject);
 private:
     jmeBulletUtil(){};
     ~jmeBulletUtil(){};