Browse Source

Fixes for x64-build with GCC

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@52 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
aramis_acg 17 years ago
parent
commit
31861d5828
2 changed files with 2 additions and 2 deletions
  1. 1 1
      code/ASEParser.h
  2. 1 1
      code/TextureTransform.h

+ 1 - 1
code/ASEParser.h

@@ -430,7 +430,7 @@ private:
 	//! \param szName Name of the enclosing element -> used in error
 	//! \param szName Name of the enclosing element -> used in error
 	//! messages.
 	//! messages.
 	//! \return false if an error occured
 	//! \return false if an error occured
-	bool Parser::ParseString(std::string& out,const char* szName);
+	bool ParseString(std::string& out,const char* szName);
 
 
 public:
 public:
 
 

+ 1 - 1
code/TextureTransform.h

@@ -125,7 +125,7 @@ public:
 	/** Returns true if a texture requires UV transformations
 	/** Returns true if a texture requires UV transformations
 	 * \param rcIn Input texture
 	 * \param rcIn Input texture
 	*/
 	*/
-	inline static bool TextureTransform::HasUVTransform(
+	inline static bool HasUVTransform(
 		const Dot3DS::Texture& rcIn)
 		const Dot3DS::Texture& rcIn)
 	{
 	{
 		return (rcIn.mOffsetU || rcIn.mOffsetV ||
 		return (rcIn.mOffsetU || rcIn.mOffsetV ||