3.17

1 files changed, 7 insertions, 3 deletions

diff --git a/shared/global_func.cpp b/shared/global_func.cpp
index 07a68187..d25f30d2 100644
--- a/shared/global_func.cpp
+++ b/shared/global_func.cpp
@@ -5,11 +5,15 @@
 // **************************************************************************
 //
 #include "global_func.h"
+#include "string_tools.h"
 #include <wx/msgdlg.h>
 #include <wx/file.h>
 #include <wx/stopwatch.h>
 #include "system_constants.h"
 
+using namespace common;
+using namespace zen;
+
 
 size_t common::getDigitCount(size_t number) //count number of digits
 {
@@ -55,13 +59,13 @@ void DebugLog::write(const wxString& logText)
     }
 
     logFile->Write(wxString(wxT("[")) + wxDateTime::Now().FormatTime() + wxT("] "));
-    logFile->Write(logText + common::LINE_BREAK);
+    logFile->Write(logText + LINE_BREAK);
 }
 
 //DebugLog logDebugInfo;
 
 
-wxString getCodeLocation(const wxString file, const int line)
+wxString getCodeLocation(const wxString& file, int line)
 {
-    return wxString(file).AfterLast(common::FILE_NAME_SEPARATOR) + wxT(", LINE ") + wxLongLong(line).ToString() + wxT(" | ");
+    return wxString(file).AfterLast(FILE_NAME_SEPARATOR) + wxT(", LINE ") + toString<wxString>(line) + wxT(" | ");
 }