From 8b78a63b5005866fb6c99dedfdab7afcf8638796 Mon Sep 17 00:00:00 2001
From: Thomas Nicky Thulesen <tnt@mmmi.sdu.dk>
Date: Tue, 23 Nov 2021 20:39:48 +0100
Subject: [PATCH 1/2] Allow dlclose of so library by avoiding unique symbols.

---
 code/CMakeLists.txt         |  1 +
 code/Common/IOSystem.cpp    | 56 +++++++++++++++++++++++++++++++++++++
 include/assimp/IOSystem.hpp |  9 ------
 3 files changed, 57 insertions(+), 9 deletions(-)
 create mode 100644 code/Common/IOSystem.cpp

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index e45bf8a2a..43bd5b825 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -174,6 +174,7 @@ SET( Common_SRCS
   Common/ImporterRegistry.cpp
   Common/DefaultProgressHandler.h
   Common/DefaultIOStream.cpp
+  Common/IOSystem.cpp
   Common/DefaultIOSystem.cpp
   Common/ZipArchiveIOSystem.cpp
   Common/PolyTools.h
diff --git a/code/Common/IOSystem.cpp b/code/Common/IOSystem.cpp
new file mode 100644
index 000000000..582485f95
--- /dev/null
+++ b/code/Common/IOSystem.cpp
@@ -0,0 +1,56 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2019, 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.
+---------------------------------------------------------------------------
+*/
+/** @file Default implementation of IOSystem using the standard C file functions */
+
+#include <assimp/IOSystem.hpp>
+
+using namespace Assimp;
+
+//const std::string Assimp::StaticDummyString;
+const std::string &IOSystem::CurrentDirectory() const {
+    if ( m_pathStack.empty() ) {
+        static const std::string Dummy = std::string();
+        return Dummy;
+    }
+    return m_pathStack[ m_pathStack.size()-1 ];
+}
diff --git a/include/assimp/IOSystem.hpp b/include/assimp/IOSystem.hpp
index dda0718e6..1c127ed73 100644
--- a/include/assimp/IOSystem.hpp
+++ b/include/assimp/IOSystem.hpp
@@ -288,15 +288,6 @@ AI_FORCE_INLINE bool IOSystem::PushDirectory( const std::string &path ) {
     return true;
 }
 
-// ----------------------------------------------------------------------------
-AI_FORCE_INLINE const std::string &IOSystem::CurrentDirectory() const {
-    if ( m_pathStack.empty() ) {
-        static const std::string Dummy;
-        return Dummy;
-    }
-    return m_pathStack[ m_pathStack.size()-1 ];
-}
-
 // ----------------------------------------------------------------------------
 AI_FORCE_INLINE size_t IOSystem::StackSize() const {
     return m_pathStack.size();

From 690e558b88d9c88a1635b1cf626bc625a8444fd4 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kimkulling@users.noreply.github.com>
Date: Thu, 25 Nov 2021 09:32:52 +0100
Subject: [PATCH 2/2] Update IOSystem.cpp

---
 code/Common/IOSystem.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/Common/IOSystem.cpp b/code/Common/IOSystem.cpp
index 582485f95..77305d193 100644
--- a/code/Common/IOSystem.cpp
+++ b/code/Common/IOSystem.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2019, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -46,7 +44,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using namespace Assimp;
 
-//const std::string Assimp::StaticDummyString;
 const std::string &IOSystem::CurrentDirectory() const {
     if ( m_pathStack.empty() ) {
         static const std::string Dummy = std::string();