From 796e072898ea4dfcc74368f4e9c3af84cbf9f073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Terziman?= <leo.terziman@clarte.asso.fr>
Date: Mon, 3 Mar 2014 15:36:32 +0100
Subject: [PATCH] Fixed warnings when using swig

---
 include/assimp/IOStream.hpp        | 5 ++++-
 include/assimp/IOSystem.hpp        | 5 ++++-
 include/assimp/LogStream.hpp       | 7 +++++--
 include/assimp/Logger.hpp          | 7 +++++--
 include/assimp/ProgressHandler.hpp | 7 +++++--
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/include/assimp/IOStream.hpp b/include/assimp/IOStream.hpp
index 54684442d..72f2e6611 100644
--- a/include/assimp/IOStream.hpp
+++ b/include/assimp/IOStream.hpp
@@ -61,7 +61,10 @@ namespace Assimp	{
  *  to the Importer. If you implement this interface, be sure to also provide an
  *  implementation for IOSystem that creates instances of your custom IO class.
 */
-class ASSIMP_API IOStream : public Intern::AllocateFromAssimpHeap
+class ASSIMP_API IOStream
+#ifndef SWIG
+	: public Intern::AllocateFromAssimpHeap
+#endif
 {
 protected:
 	/** Constructor protected, use IOSystem::Open() to create an instance. */
diff --git a/include/assimp/IOSystem.hpp b/include/assimp/IOSystem.hpp
index 76135146b..197988f72 100644
--- a/include/assimp/IOSystem.hpp
+++ b/include/assimp/IOSystem.hpp
@@ -64,7 +64,10 @@ class IOStream;
  *  supply a custom implementation for IOStream.
  *
  *  @see Importer::SetIOHandler() */
-class ASSIMP_API IOSystem : public Intern::AllocateFromAssimpHeap
+class ASSIMP_API IOSystem
+#ifndef SWIG
+	: public Intern::AllocateFromAssimpHeap
+#endif
 {
 public:
 
diff --git a/include/assimp/LogStream.hpp b/include/assimp/LogStream.hpp
index afd35a2fc..25b1c65f5 100644
--- a/include/assimp/LogStream.hpp
+++ b/include/assimp/LogStream.hpp
@@ -53,8 +53,11 @@ class IOSystem;
  *  Several default implementations are provided, see #aiDefaultLogStream for more
  *  details. Writing your own implementation of LogStream is just necessary if these
  *  are not enough for your purpose. */
-class ASSIMP_API LogStream 
-	: public Intern::AllocateFromAssimpHeap	{
+class ASSIMP_API LogStream
+#ifndef SWIG
+	: public Intern::AllocateFromAssimpHeap
+#endif
+{
 protected:
 	/** @brief	Default constructor	*/
 	LogStream() {
diff --git a/include/assimp/Logger.hpp b/include/assimp/Logger.hpp
index 1c3d224ea..a30b5b0dc 100644
--- a/include/assimp/Logger.hpp
+++ b/include/assimp/Logger.hpp
@@ -56,8 +56,11 @@ class LogStream;
  *  Assimp provides a default implementation and uses it for almost all 
  *  logging stuff ('DefaultLogger'). This class defines just basic logging
  *  behaviour and is not of interest for you. Instead, take a look at #DefaultLogger. */
-class ASSIMP_API Logger 
-	: public Intern::AllocateFromAssimpHeap	{
+class ASSIMP_API Logger
+#ifndef SWIG
+	: public Intern::AllocateFromAssimpHeap
+#endif
+{
 public:
 
 	// ----------------------------------------------------------------------
diff --git a/include/assimp/ProgressHandler.hpp b/include/assimp/ProgressHandler.hpp
index 26f79566a..31c746c59 100644
--- a/include/assimp/ProgressHandler.hpp
+++ b/include/assimp/ProgressHandler.hpp
@@ -51,8 +51,11 @@ namespace Assimp	{
  *
  *  Each #Importer instance maintains its own #ProgressHandler. The default 
  *  implementation provided by Assimp doesn't do anything at all. */
-class ASSIMP_API ProgressHandler 
-	: public Intern::AllocateFromAssimpHeap	{
+class ASSIMP_API ProgressHandler
+#ifndef SWIG
+	: public Intern::AllocateFromAssimpHeap
+#endif
+{
 protected:
 	/** @brief	Default constructor	*/
 	ProgressHandler () {