Переглянути джерело

Remove unnecessary semicolons after function definition

Picked up by clang -Wextra-semi
Turo Lamminen 10 роки тому
батько
коміт
308884f144

+ 5 - 5
code/AssbinExporter.cpp

@@ -273,13 +273,13 @@ inline size_t WriteArray(IOStream * stream, const T* in, unsigned int size)
 			if (buffer) delete[] buffer;
 			if (buffer) delete[] buffer;
 		}
 		}
 
 
-		void * GetBufferPointer() { return buffer; };
+		void * GetBufferPointer() { return buffer; }
 
 
 		// -------------------------------------------------------------------
 		// -------------------------------------------------------------------
-		virtual size_t Read(void* /*pvBuffer*/, size_t /*pSize*/, size_t /*pCount*/) { return 0; };
-		virtual aiReturn Seek(size_t /*pOffset*/, aiOrigin /*pOrigin*/) { return aiReturn_FAILURE; };
-		virtual size_t Tell() const { return cursor; };
-		virtual void Flush() { };
+		virtual size_t Read(void* /*pvBuffer*/, size_t /*pSize*/, size_t /*pCount*/) { return 0; }
+		virtual aiReturn Seek(size_t /*pOffset*/, aiOrigin /*pOrigin*/) { return aiReturn_FAILURE; }
+		virtual size_t Tell() const { return cursor; }
+		virtual void Flush() { }
 
 
 		virtual size_t FileSize() const
 		virtual size_t FileSize() const
 		{
 		{

+ 1 - 1
code/irrXMLWrapper.h

@@ -102,7 +102,7 @@ public:
 
 
 	// ----------------------------------------------------------------------------------
 	// ----------------------------------------------------------------------------------
 	//! Virtual destructor
 	//! Virtual destructor
-	virtual ~CIrrXML_IOStreamReader() {};
+	virtual ~CIrrXML_IOStreamReader() {}
 
 
 	// ----------------------------------------------------------------------------------
 	// ----------------------------------------------------------------------------------
 	//!   Reads an amount of bytes from the file.
 	//!   Reads an amount of bytes from the file.

+ 2 - 2
include/assimp/Importer.hpp

@@ -624,8 +624,8 @@ public:
 
 
 	// -------------------------------------------------------------------
 	// -------------------------------------------------------------------
 	/** Private, do not use. */
 	/** Private, do not use. */
-	ImporterPimpl* Pimpl() { return pimpl; };
-	const ImporterPimpl* Pimpl() const { return pimpl; };
+	ImporterPimpl* Pimpl() { return pimpl; }
+	const ImporterPimpl* Pimpl() const { return pimpl; }
 
 
 protected:
 protected:
 
 

+ 2 - 2
include/assimp/ProgressHandler.hpp

@@ -99,7 +99,7 @@ public:
 	virtual void UpdateFileRead(int currentStep /*= 0*/, int numberOfSteps /*= 0*/) {
 	virtual void UpdateFileRead(int currentStep /*= 0*/, int numberOfSteps /*= 0*/) {
 		float f = numberOfSteps ? currentStep / (float)numberOfSteps : 1.0f;
 		float f = numberOfSteps ? currentStep / (float)numberOfSteps : 1.0f;
 		Update( f * 0.5f );
 		Update( f * 0.5f );
-	};
+	}
 
 
 	// -------------------------------------------------------------------
 	// -------------------------------------------------------------------
 	/** @brief Progress callback for post-processing steps
 	/** @brief Progress callback for post-processing steps
@@ -113,7 +113,7 @@ public:
 	virtual void UpdatePostProcess(int currentStep /*= 0*/, int numberOfSteps /*= 0*/) {
 	virtual void UpdatePostProcess(int currentStep /*= 0*/, int numberOfSteps /*= 0*/) {
 		float f = numberOfSteps ? currentStep / (float)numberOfSteps : 1.0f;
 		float f = numberOfSteps ? currentStep / (float)numberOfSteps : 1.0f;
 		Update( f * 0.5f + 0.5f );
 		Update( f * 0.5f + 0.5f );
-	};
+	}
 
 
 }; // !class ProgressHandler 
 }; // !class ProgressHandler 
 // ------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------