Merge pull request #4850 from assimp/kimkulling/move_asserthandler_to_include_issue-4779
Refactoring: Move asserthandler header to includepull/4852/head
commit
7eadcebc9f
|
@ -1,6 +1,5 @@
|
||||||
# Open Asset Import Library (assimp)
|
# Open Asset Import Library (assimp)
|
||||||
# ----------------------------------------------------------------------
|
# ----------------------------------------------------------------------
|
||||||
#
|
|
||||||
# Copyright (c) 2006-2022, assimp team
|
# Copyright (c) 2006-2022, assimp team
|
||||||
#
|
#
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
|
@ -94,6 +93,7 @@ SET( PUBLIC_HEADERS
|
||||||
${HEADER_PATH}/vector3.inl
|
${HEADER_PATH}/vector3.inl
|
||||||
${HEADER_PATH}/version.h
|
${HEADER_PATH}/version.h
|
||||||
${HEADER_PATH}/cimport.h
|
${HEADER_PATH}/cimport.h
|
||||||
|
${HEADER_PATH}/AssertHandler.h
|
||||||
${HEADER_PATH}/importerdesc.h
|
${HEADER_PATH}/importerdesc.h
|
||||||
${HEADER_PATH}/Importer.hpp
|
${HEADER_PATH}/Importer.hpp
|
||||||
${HEADER_PATH}/DefaultLogger.hpp
|
${HEADER_PATH}/DefaultLogger.hpp
|
||||||
|
|
|
@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
* @brief Implementation of assert handling logic.
|
* @brief Implementation of assert handling logic.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "AssertHandler.h"
|
#include <assimp/AssertHandler.h>
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
|
|
@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <assimp/ai_assert.h>
|
#include <assimp/ai_assert.h>
|
||||||
#include <code/Common/AssertHandler.h>
|
#include <assimp/AssertHandler.h>
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
|
|
|
@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#include "UnitTestPCH.h"
|
#include "UnitTestPCH.h"
|
||||||
|
|
||||||
#include "Common/BaseProcess.h"
|
#include "Common/BaseProcess.h"
|
||||||
#include "Common/AssertHandler.h"
|
#include <assimp/AssertHandler.h>
|
||||||
|
|
||||||
using namespace Assimp;
|
using namespace Assimp;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue