Fixed warnings when using swig

pull/261/head
Léo Terziman 2014-03-03 15:36:32 +01:00
parent 172c917c37
commit 796e072898
5 changed files with 23 additions and 8 deletions

View File

@ -61,7 +61,10 @@ namespace Assimp {
* to the Importer. If you implement this interface, be sure to also provide an * 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. * 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: protected:
/** Constructor protected, use IOSystem::Open() to create an instance. */ /** Constructor protected, use IOSystem::Open() to create an instance. */

View File

@ -64,7 +64,10 @@ class IOStream;
* supply a custom implementation for IOStream. * supply a custom implementation for IOStream.
* *
* @see Importer::SetIOHandler() */ * @see Importer::SetIOHandler() */
class ASSIMP_API IOSystem : public Intern::AllocateFromAssimpHeap class ASSIMP_API IOSystem
#ifndef SWIG
: public Intern::AllocateFromAssimpHeap
#endif
{ {
public: public:

View File

@ -53,8 +53,11 @@ class IOSystem;
* Several default implementations are provided, see #aiDefaultLogStream for more * Several default implementations are provided, see #aiDefaultLogStream for more
* details. Writing your own implementation of LogStream is just necessary if these * details. Writing your own implementation of LogStream is just necessary if these
* are not enough for your purpose. */ * are not enough for your purpose. */
class ASSIMP_API LogStream class ASSIMP_API LogStream
: public Intern::AllocateFromAssimpHeap { #ifndef SWIG
: public Intern::AllocateFromAssimpHeap
#endif
{
protected: protected:
/** @brief Default constructor */ /** @brief Default constructor */
LogStream() { LogStream() {

View File

@ -56,8 +56,11 @@ class LogStream;
* Assimp provides a default implementation and uses it for almost all * Assimp provides a default implementation and uses it for almost all
* logging stuff ('DefaultLogger'). This class defines just basic logging * logging stuff ('DefaultLogger'). This class defines just basic logging
* behaviour and is not of interest for you. Instead, take a look at #DefaultLogger. */ * behaviour and is not of interest for you. Instead, take a look at #DefaultLogger. */
class ASSIMP_API Logger class ASSIMP_API Logger
: public Intern::AllocateFromAssimpHeap { #ifndef SWIG
: public Intern::AllocateFromAssimpHeap
#endif
{
public: public:
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------

View File

@ -51,8 +51,11 @@ namespace Assimp {
* *
* Each #Importer instance maintains its own #ProgressHandler. The default * Each #Importer instance maintains its own #ProgressHandler. The default
* implementation provided by Assimp doesn't do anything at all. */ * implementation provided by Assimp doesn't do anything at all. */
class ASSIMP_API ProgressHandler class ASSIMP_API ProgressHandler
: public Intern::AllocateFromAssimpHeap { #ifndef SWIG
: public Intern::AllocateFromAssimpHeap
#endif
{
protected: protected:
/** @brief Default constructor */ /** @brief Default constructor */
ProgressHandler () { ProgressHandler () {