From 256f28432a468ffed50b50d82e7bc2ab0aa2ce1f Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 25 Jul 2017 09:37:28 +0200 Subject: [PATCH] unittests: fix the build again. --- test/CMakeLists.txt | 1 + test/unit/UTLogStream.h | 63 +++++++++++++++++++++++++++++++++++++++++ test/unit/UnitTestPCH.h | 23 +-------------- 3 files changed, 65 insertions(+), 22 deletions(-) create mode 100644 test/unit/UTLogStream.h diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1d5b4ae5d..2d065e3be 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -57,6 +57,7 @@ SOURCE_GROUP( unit FILES ) SET( TEST_SRCS + unit/UTLogStream.h unit/AbstractImportExportBase.cpp unit/TestIOSystem.h unit/TestModelFactory.h diff --git a/test/unit/UTLogStream.h b/test/unit/UTLogStream.h new file mode 100644 index 000000000..df4467b3e --- /dev/null +++ b/test/unit/UTLogStream.h @@ -0,0 +1,63 @@ +/* +--------------------------------------------------------------------------- +Open Asset Import Library (assimp) +--------------------------------------------------------------------------- + +Copyright (c) 2006-2017, assimp 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 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. +--------------------------------------------------------------------------- +*/ +#pragma once + +#include + +class UTLogStream : public Assimp::LogStream { +public: + UTLogStream() + : LogStream() { + // empty + } + + virtual ~UTLogStream() { + // empty + } + + void write(const char* message) override { + if ( nullptr != message ) { + m_messages.push_back( std::string( message ) ); + } + } + + std::vector m_messages; +}; diff --git a/test/unit/UnitTestPCH.h b/test/unit/UnitTestPCH.h index 96b05bd81..0d5f08992 100644 --- a/test/unit/UnitTestPCH.h +++ b/test/unit/UnitTestPCH.h @@ -5,7 +5,6 @@ Open Asset Import Library (assimp) Copyright (c) 2006-2017, assimp team - All rights reserved. Redistribution and use of this software in source and binary forms, @@ -47,27 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include - -class UTLogStream : public Assimp::LogStream { -public: - UTLogStream() - : LogStream() { - // empty - } - - virtual ~UTLogStream() { - // empty - } - - void write(const char* message) override { - if ( nullptr != message ) { - m_messages.push_back( std::string( message ) ); - } - } - - std::vector m_messages; -}; +#include "UTLogStream.h" #undef min #undef max