From 48a772b20bda1ab2b59ba79c93213ec162eb4074 Mon Sep 17 00:00:00 2001
From: abma <spring@abma.de>
Date: Mon, 18 Aug 2014 00:46:21 +0200
Subject: [PATCH] =?UTF-8?q?fix=20compiler=20warnings:=20-=20defined=20but?=
 =?UTF-8?q?=20not=20used=20-=20deprecated=20conversion=20from=20string=20c?=
 =?UTF-8?q?onstant=20to=20=E2=80=98char*=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/OgreBinarySerializer.h    | 4 ++++
 test/unit/utRemoveComments.cpp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/OgreBinarySerializer.h b/code/OgreBinarySerializer.h
index 8b4e3ccfe..429c9b1c5 100644
--- a/code/OgreBinarySerializer.h
+++ b/code/OgreBinarySerializer.h
@@ -306,6 +306,7 @@ enum MeshChunkId
 		// float extremes [n_extremes][3];
 };
 
+/*
 static std::string MeshHeaderToString(MeshChunkId id)
 {
 	switch(id)
@@ -347,6 +348,7 @@ static std::string MeshHeaderToString(MeshChunkId id)
 	}
 	return "Unknown_MeshChunkId";
 }
+*/
 
 enum SkeletonChunkId
 {
@@ -393,6 +395,7 @@ enum SkeletonChunkId
 		// float scale							: scale to apply to trans/scale keys
 };
 
+/*
 static std::string SkeletonHeaderToString(SkeletonChunkId id)
 {
 	switch(id)
@@ -409,6 +412,7 @@ static std::string SkeletonHeaderToString(SkeletonChunkId id)
 	}
 	return "Unknown_SkeletonChunkId";
 }
+*/
 } // Ogre
 } // Assimp
 
diff --git a/test/unit/utRemoveComments.cpp b/test/unit/utRemoveComments.cpp
index f1d11ec72..5779946eb 100644
--- a/test/unit/utRemoveComments.cpp
+++ b/test/unit/utRemoveComments.cpp
@@ -43,7 +43,7 @@ void RemoveCommentsTest :: testSingleLineComments (void)
 // ------------------------------------------------------------------------------------------------
 void RemoveCommentsTest :: testMultiLineComments (void)
 {
-	char* szTest = 
+	const char* szTest = 
 		"/* comment to be removed */\n"
 		"valid text /* \n "
 		" comment across multiple lines */"
@@ -62,4 +62,4 @@ void RemoveCommentsTest :: testMultiLineComments (void)
 	CPPUNIT_ASSERT(0 == ::strcmp(szTest2,szTestResult));
 
 	delete[] szTest2;
-}
\ No newline at end of file
+}