Changes for Linux.

This commit is contained in:
LuisAntonRebollo 2015-01-18 21:35:11 +01:00
parent aa35157eef
commit 3336bffad2
30 changed files with 99 additions and 173 deletions

View file

@ -1647,7 +1647,7 @@ StringStackConsoleWrapper::~StringStackConsoleWrapper()
{
for (int i=0; i<argc; i++)
{
argv[i] = NULL;
argv[i] = 0;
}
delete[] argv;
}

View file

@ -579,7 +579,7 @@ AbstractClassRep* ConsoleObject::getClassRep() const
return NULL;
}
String ConsoleObject::_getLogMessage(const char* fmt, void* args) const
String ConsoleObject::_getLogMessage(const char* fmt, va_list args) const
{
String objClass = "UnknownClass";
if(getClassRep())

View file

@ -863,7 +863,7 @@ public:
/// @param fmt A printf style format string.
/// @param args A va_list containing the args passed ot a log function.
/// @note It is suggested that you use String::VToString.
virtual String _getLogMessage(const char* fmt, void* args) const;
virtual String _getLogMessage(const char* fmt, va_list args) const;
/// @}

View file

@ -1833,7 +1833,7 @@ void SimObject::inspectPostApply()
//-----------------------------------------------------------------------------
String SimObject::_getLogMessage(const char* fmt, void* args) const
String SimObject::_getLogMessage(const char* fmt, va_list args) const
{
String objClass = "UnknownClass";
if(getClassRep())

View file

@ -411,7 +411,7 @@ class SimObject: public ConsoleObject
virtual void _onUnselected() {}
/// We can provide more detail, like object name and id.
virtual String _getLogMessage(const char* fmt, void* args) const;
virtual String _getLogMessage(const char* fmt, va_list args) const;
DEFINE_CREATE_METHOD
{