Fix for g++ -Wall warnings

hanjukim · hanjukim · commit 23ff8fd90b39 · 2014-03-06T19:42:50.000+09:00
diff --git a/findpath.cpp b/findpath.cpp
@@ -76,11 +76,11 @@ int GetMap( int x, int y )
 class MapSearchNode
 {
 public:
-	unsigned int x;	 // the (x,y) positions of the node
-	unsigned int y;	
+	int x;	 // the (x,y) positions of the node
+	int y;	
 	
 	MapSearchNode() { x = y = 0; }
-	MapSearchNode( unsigned int px, unsigned int py ) { x=px; y=py; }
+	MapSearchNode( int px, int py ) { x=px; y=py; }
 
 	float GoalDistanceEstimate( MapSearchNode &nodeGoal );
 	bool IsGoal( MapSearchNode &nodeGoal );
diff --git a/fsa.h b/fsa.h
@@ -71,8 +71,8 @@ template <class USER_TYPE> class FixedSizeAllocator
 
 public: // methods
 	FixedSizeAllocator( unsigned int MaxElements = FSA_DEFAULT_SIZE ) :
-	m_MaxElements( MaxElements ),
-	m_pFirstUsed( NULL )
+	m_pFirstUsed( NULL ),
+	m_MaxElements( MaxElements )
 	{
 		// Allocate enough memory for the maximum number of elements
 
diff --git a/stlastar.h b/stlastar.h
@@ -48,7 +48,9 @@ using namespace std;
 
 // disable warning that debugging information has lines that are truncated
 // occurs in stl headers
+#if defined(WIN32) && defined(_WINDOWS)
 #pragma warning( disable : 4786 )
+#endif
 
 template <class T> class AStarState;
 
@@ -117,23 +119,23 @@ template <class UserState> class AStarSearch
 
 	// constructor just initialises private data
 	AStarSearch() :
-		m_AllocateNodeCount(0),
+		m_State( SEARCH_STATE_NOT_INITIALISED ),
+		m_CurrentSolutionNode( NULL ),
 #if USE_FSA_MEMORY
 		m_FixedSizeAllocator( 1000 ),
 #endif
-		m_State( SEARCH_STATE_NOT_INITIALISED ),
-		m_CurrentSolutionNode( NULL ),
+		m_AllocateNodeCount(0),
 		m_CancelRequest( false )
 	{
 	}
 
 	AStarSearch( int MaxNodes ) :
-		m_AllocateNodeCount(0),
+		m_State( SEARCH_STATE_NOT_INITIALISED ),
+		m_CurrentSolutionNode( NULL ),
 #if USE_FSA_MEMORY
 		m_FixedSizeAllocator( MaxNodes ),
 #endif
-		m_State( SEARCH_STATE_NOT_INITIALISED ),
-		m_CurrentSolutionNode( NULL ),
+		m_AllocateNodeCount(0),
 		m_CancelRequest( false )
 	{
 	}

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ template <class USER_TYPE> class FixedSizeAllocator`
`71`	`71`
`72`	`72`	`public: // methods`
`73`	`73`	`FixedSizeAllocator( unsigned int MaxElements = FSA_DEFAULT_SIZE ) :`
`74`		`- m_MaxElements( MaxElements ),`
`75`		`- m_pFirstUsed( NULL )`
	`74`	`+ m_pFirstUsed( NULL ),`
	`75`	`+ m_MaxElements( MaxElements )`
`76`	`76`	`{`
`77`	`77`	`// Allocate enough memory for the maximum number of elements`
`78`	`78`