Changeset 4605 for vtkvis/branches/1.7/Trace.h

Timestamp:

Aug 2, 2014 12:33:06 AM (10 years ago)

Author:

ldelgass

Message:

Merge crash fix from r4422 in trunk

Location:

vtkvis/branches/1.7

Files:

• . (modified) (1 prop)
• Trace.h (modified) (2 diffs)

vtkvis/branches/1.7/Trace.h

@@ -9 +9 @@
 #define VTKVIS_TRACE_H
 
+#include <string>
+
 #include <syslog.h>
 
@@ -15 +17 @@
 extern void logUserMessage(const char* format, ...);
 
-extern const char *getUserMessages();
+extern std::string getUserMessages();
 
 extern void clearUserMessages();