v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflict resolution again, temp. move LogAux.h

pull/1683/head
BuildTools 2018-01-15 19:07:33 -08:00
parent 68db518696
commit d0c92e30be
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/assimp/LogAux.h → code/LogAux.h
View File

@ -45,18 +45,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef INCLUDED_AI_LOGAUX_H #ifndef INCLUDED_AI_LOGAUX_H
#define INCLUDED_AI_LOGAUX_H #define INCLUDED_AI_LOGAUX_H
#include "TinyFormatter.h" #include <assimp/TinyFormatter.h>
#include "Exceptional.h" #include <assimp/Exceptional.h>
#include <assimp/DefaultLogger.hpp> #include <assimp/DefaultLogger.hpp>
namespace Assimp { namespace Assimp {
template<class TDeriving> template<class TDeriving>
class LogFunctions class LogFunctions {
{
public: public:
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
static void ThrowException(const std::string& msg) static void ThrowException(const std::string& msg)
{ {