Merge pull request #4850 from assimp/kimkulling/move_asserthandler_to_include_issue-4779

Refactoring: Move asserthandler header to include
pull/4852/head
Kim Kulling 2022-12-23 16:57:37 +01:00 committed by GitHub
commit 7eadcebc9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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>

View File

@ -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
{ {

View File

@ -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;