diff --git a/include/DefaultLogger.h b/include/DefaultLogger.h index 6cdd5e850..dd756d0f2 100644 --- a/include/DefaultLogger.h +++ b/include/DefaultLogger.h @@ -41,7 +41,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #if (!defined AI_DEFAULTLOGGER_H_INCLUDED) #define AI_DEFAULTLOGGER_H_INCLUDED -#include "../include/Logger.h" +#include "Logger.h" +#include "NullLogger.h" #include namespace Assimp @@ -51,38 +52,6 @@ class IOStream; struct LogStreamInfo; -// --------------------------------------------------------------------------- -/** @class NullLogger - * @brief Empty logging implementation. Does nothing. Used by default - * if the application hasn't specified a custom logger (or DefaultLogger) - * via DefaultLogger::set() or DefaultLogger::create(); - */ -class NullLogger : public Logger -{ -public: - /** @brief Logs a debug message */ - void debug(const std::string &message) {} - - /** @brief Logs an info message */ - void info(const std::string &message) {} - - /** @brief Logs a warning message */ - void warn(const std::string &message) {} - - /** @brief Logs an error message */ - void error(const std::string &message) {} - - /** @brief Log severity setter */ - void setLogSeverity(LogSeverity log_severity) {} - - /** @brief Detach a still attached stream from logger */ - void attachStream(LogStream *pStream, unsigned int severity) {} - - /** @brief Detach a still attached stream from logger */ - void detatchStream(LogStream *pStream, unsigned int severity) {} -}; - - // --------------------------------------------------------------------------- /** @class DefaultLogger * @brief Default logging implementation. The logger writes into a file. diff --git a/include/NullLogger.h b/include/NullLogger.h new file mode 100644 index 000000000..0fd603db2 --- /dev/null +++ b/include/NullLogger.h @@ -0,0 +1,82 @@ +/* +Open Asset Import Library (ASSIMP) +---------------------------------------------------------------------- + +Copyright (c) 2006-2008, ASSIMP Development Team +All rights reserved. + +Redistribution and use of this software in source and binary forms, +with or without modification, are permitted provided that the +following conditions are met: + +* Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + +* Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the + following disclaimer in the documentation and/or other + materials provided with the distribution. + +* Neither the name of the ASSIMP team, nor the names of its + contributors may be used to endorse or promote products + derived from this software without specific prior + written permission of the ASSIMP Development Team. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +---------------------------------------------------------------------- +*/ + +#if (!defined AI_NULLLOGGER_H_INCLUDED) +#define AI_NULLLOGGER_H_INCLUDED + +#include "../include/Logger.h" + +namespace Assimp +{ + +// --------------------------------------------------------------------------- +/** @class NullLogger + * @brief Empty logging implementation. Does nothing. Used by default + * if the application hasn't specified a custom logger (or DefaultLogger) + * via DefaultLogger::set() or DefaultLogger::create(); + */ +class NullLogger : public Logger +{ +public: + /** @brief Logs a debug message */ + void debug(const std::string &message) {} + + /** @brief Logs an info message */ + void info(const std::string &message) {} + + /** @brief Logs a warning message */ + void warn(const std::string &message) {} + + /** @brief Logs an error message */ + void error(const std::string &message) {} + + /** @brief Log severity setter */ + void setLogSeverity(LogSeverity log_severity) {} + + /** @brief Detach a still attached stream from logger */ + void attachStream(LogStream *pStream, unsigned int severity) {} + + /** @brief Detach a still attached stream from logger */ + void detatchStream(LogStream *pStream, unsigned int severity) {} +}; + +} + +#endif // !! AI_NULLLOGGER_H_INCLUDED \ No newline at end of file