From 99acec63f175fecd7172c927263ed3787cb082d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Tue, 11 Jun 2019 13:18:05 +0200
Subject: bullet: Sync with current upstream master branch

This updates our local copy to commit 5ec8339b6fc491e3f09a34a4516e82787f053fcc.
We need a recent master commit for some new features that we use in Godot
(see #25543 and #28909).

To avoid warnings generated by Bullet headers included in our own module,
we include those headers with -isystem on GCC and Clang.

Fixes #29503.
---
 thirdparty/bullet/LinearMath/btMatrixX.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'thirdparty/bullet/LinearMath/btMatrixX.h')

diff --git a/thirdparty/bullet/LinearMath/btMatrixX.h b/thirdparty/bullet/LinearMath/btMatrixX.h
index 9df9e49469..388c57c2d7 100644
--- a/thirdparty/bullet/LinearMath/btMatrixX.h
+++ b/thirdparty/bullet/LinearMath/btMatrixX.h
@@ -263,7 +263,10 @@ struct btMatrixX
 	{
 		{
 			BT_PROFILE("storage=0");
-			btSetZero(&m_storage[0], m_storage.size());
+			if (m_storage.size())
+			{
+				btSetZero(&m_storage[0], m_storage.size());
+			}
 			//memset(&m_storage[0],0,sizeof(T)*m_storage.size());
 			//for (int i=0;i<m_storage.size();i++)
 			//			m_storage[i]=0;
@@ -281,7 +284,7 @@ struct btMatrixX
 		}
 	}
 
-	void printMatrix(const char* msg)
+	void printMatrix(const char* msg) const
 	{
 		printf("%s ---------------------\n", msg);
 		for (int i = 0; i < rows(); i++)
-- 
cgit v1.2.3