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
This commit is contained in:
@@ -127,7 +127,7 @@ void CLogWindow::Show()
|
||||
}
|
||||
}
|
||||
//-------------------------------------------------------------------------------
|
||||
void CMyLogStream::write(const std::string &message)
|
||||
void CMyLogStream::write(const char* message)
|
||||
{
|
||||
CLogWindow::Instance().WriteLine(message);
|
||||
}
|
||||
@@ -193,7 +193,7 @@ void CLogWindow::Save()
|
||||
D3DCOLOR_ARGB(0xFF,0xFF,0xFF,0));
|
||||
}
|
||||
//-------------------------------------------------------------------------------
|
||||
void CLogWindow::WriteLine(const std::string& message)
|
||||
void CLogWindow::WriteLine(const char* message)
|
||||
{
|
||||
this->szPlainText.append(message);
|
||||
this->szPlainText.append("\r\n");
|
||||
@@ -203,7 +203,7 @@ void CLogWindow::WriteLine(const std::string& message)
|
||||
this->szText.resize(this->szText.length()-1);
|
||||
}
|
||||
|
||||
switch (message.c_str()[0])
|
||||
switch (message[0])
|
||||
{
|
||||
case 'e':
|
||||
case 'E':
|
||||
|
||||
@@ -52,7 +52,7 @@ class CMyLogStream : Assimp::LogStream
|
||||
{
|
||||
public:
|
||||
/** @brief Implementation of the abstract method */
|
||||
void write(const std::string &message);
|
||||
void write(const char* message);
|
||||
};
|
||||
|
||||
|
||||
@@ -93,7 +93,7 @@ public:
|
||||
void Save();
|
||||
|
||||
// write a line to the log window
|
||||
void WriteLine(const std::string& message);
|
||||
void WriteLine(const char* message);
|
||||
|
||||
// Set the bUpdate member
|
||||
inline void SetAutoUpdate(bool b)
|
||||
|
||||
Reference in New Issue
Block a user