Removed direct STL dependency from the Assimp interface, should hopefully avoid problems with binary incompatible STLs. Some API changes, e.g. in the logger.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@321 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

include/IOSystem.h

@@ -52,70 +52,101 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	corresponding C interface.
 #endif
 
-
 #include "aiTypes.h"
 namespace Assimp	{
-
 class IOStream;
 
 // ---------------------------------------------------------------------------
 /** @class IOSystem
-*   @brief Interface to the file system.
-*
-* Derive an own implementation from this interface to supply custom file handling
-* to the importer library. If you implement this interface, you also want to
-* supply a custom implementation for IOStream.
-*/
-class ASSIMP_API IOSystem
+ *  @brief Interface to the file system.
+ *
+ *  Derive an own implementation from this interface to supply custom file handling
+ *  to the importer library. If you implement this interface, you also want to
+ *  supply a custom implementation for IOStream.
+ *
+ *  @see Importer::SetIOHandler()
+ */
+class ASSIMP_API IOSystem : public Intern::AllocateFromAssimpHeap
 {
 public:
-	/** @brief Constructor. Create an instance of your derived class and
-	 * assign it to an #Assimp::Importer instance by calling Importer::SetIOHandler().
+
+	// -------------------------------------------------------------------
+	/** @brief Default constructor.
+	 *
+	 *  Create an instance of your derived class and assign it to an 
+	 *  #Assimp::Importer instance by calling Importer::SetIOHandler().
 	 */
 	IOSystem();
 
-	/** Destructor. */
+	// -------------------------------------------------------------------
+	/** @brief Virtual destructor.
+	 *
+	 *  It is safe to be called from within DLL Assimp, we're constructed
+	 *  on Assimp's heap.
+	 */
 	virtual ~IOSystem();
 
+
+public:
+
+	// -------------------------------------------------------------------
+	/** @brief For backward compatibility
+	 *  @see Exists(const char*)
+	 */
+	AI_FORCE_INLINE bool Exists( const std::string& pFile) const;
+
 	// -------------------------------------------------------------------
 	/** @brief Tests for the existence of a file at the given path. 
-	*
-	* @param pFile Path to the file
-	* @return true if there is a file with this path, else false.
-	*/
-	virtual bool Exists( const std::string& pFile) const = 0;
+	 *
+	 * @param pFile Path to the file
+	 * @return true if there is a file with this path, else false.
+	 */
+
+	virtual bool Exists( const char* pFile) const = 0;
+
+
 
 	// -------------------------------------------------------------------
 	/**	@brief Returns the system specific directory separator
-	*	@return	System specific directory separator
-	*/
-	virtual std::string getOsSeparator() const = 0;
+	 *	@return	System specific directory separator
+	 */
+	virtual char getOsSeparator() const = 0;
+
 
 	// -------------------------------------------------------------------
 	/** @brief Open a new file with a given path.
-	*
-	*  When the access to the file is finished, call Close() to release
-	*  all associated resources.
-	*
-	* @param pFile Path to the file
-	* @param pMode Desired file I/O mode. Required are: "wb", "w", "wt",
-	*        "rb", "r", "rt".
-	*
-	* @return New IOStream interface allowing the lib to access
-	*         the underlying file. 
-	* @note When implementing this class to provide custom IO handling, 
-	* you probably have to supply an own implementation of IOStream as well. 
-	*/
-	virtual IOStream* Open(const std::string& pFile,
-		const std::string& pMode = std::string("rb")) = 0;
+	 *
+	 *  When the access to the file is finished, call Close() to release
+	 *  all associated resources (or the virtual dtor of the IOStream).
+	 *
+	 *  @param pFile Path to the file
+	 *  @param pMode Desired file I/O mode. Required are: "wb", "w", "wt",
+	 *         "rb", "r", "rt".
+	 *
+	 *  @return New IOStream interface allowing the lib to access
+	 *         the underlying file. 
+	 *  @note When implementing this class to provide custom IO handling, 
+	 *  you probably have to supply an own implementation of IOStream as well. 
+	 */
+	virtual IOStream* Open(const char* pFile,
+		const char* pMode = "rb") = 0;
 
 	// -------------------------------------------------------------------
-	/** @brief Closes the given file and releases all resources associated with it.
+	/** @brief For backward compatibility
+	 *  @see Open(const char*, const char*)
+	 */
+	inline IOStream* Open(const std::string& pFile,
+		const std::string& pMode = std::string("rb"));
+
+
+
+	// -------------------------------------------------------------------
+	/** @brief Closes the given file and releases all resources 
+	 *    associated with it.
 	 *  @param pFile The file instance previously created by Open().
 	 */
 	virtual void Close( IOStream* pFile) = 0;
 
-
 	// -------------------------------------------------------------------
 	/** @brief Compares two paths and check whether the point to
 	 *         identical files.
@@ -129,24 +160,65 @@ public:
 	 * @return true if the paths point to the same file. The file needn't
 	 *   be existing, however.
 	 */
-	virtual bool ComparePaths (const std::string& one, 
-		const std::string& second);
+	virtual bool ComparePaths (const char* one, 
+		const char* second) const;
+
+	// -------------------------------------------------------------------
+	/** @brief For backward compatibility
+	 *  @see ComparePaths(const char*, const char*)
+	 */
+	inline bool ComparePaths (const std::string& one, 
+		const std::string& second) const;
 };
 
 // ----------------------------------------------------------------------------
-inline IOSystem::IOSystem() 
+AI_FORCE_INLINE IOSystem::IOSystem() 
 {
 	// empty
 }
 
 // ----------------------------------------------------------------------------
-inline IOSystem::~IOSystem() 
+AI_FORCE_INLINE IOSystem::~IOSystem() 
 {
 	// empty
 }
+
+// ----------------------------------------------------------------------------
+// For compatibility, the interface of some functions taking a std::string was
+// changed to const char* to avoid crashes between binary incompatible STL 
+// versions. This code her is inlined,  so it shouldn't cause any problems.
 // ----------------------------------------------------------------------------
 
+// ----------------------------------------------------------------------------
+AI_FORCE_INLINE IOStream* IOSystem::Open(const std::string& pFile,
+	const std::string& pMode)
+{
+	// NOTE:
+	// For compatibility, interface was changed to const char* to
+	// avoid crashes between binary incompatible STL versions 
+	return Open(pFile.c_str(),pMode.c_str());
+}
 
+// ----------------------------------------------------------------------------
+AI_FORCE_INLINE bool IOSystem::Exists( const std::string& pFile) const
+{
+	// NOTE:
+	// For compatibility, interface was changed to const char* to
+	// avoid crashes between binary incompatible STL versions 
+	return Exists(pFile.c_str());
+}
+
+// ----------------------------------------------------------------------------
+inline bool IOSystem::ComparePaths (const std::string& one, 
+	const std::string& second) const
+{
+	// NOTE:
+	// For compatibility, interface was changed to const char* to
+	// avoid crashes between binary incompatible STL versions 
+	return ComparePaths(one.c_str(),second.c_str());
+}
+
+// ----------------------------------------------------------------------------
 } //!ns Assimp
 
 #endif //AI_IOSYSTEM_H_INC