utf: history_manager 2

Change-Id: I68553b2a0e5d4eab94da4d0d160d8dd2a6e595ca

diff --git a/scilab/modules/history_manager/sci_gateway/cpp/sci_saveconsecutivecommands.cpp b/scilab/modules/history_manager/sci_gateway/cpp/sci_saveconsecutivecommands.cpp
index 050a132..fb662ed 100644 (file)
--- a/scilab/modules/history_manager/sci_gateway/cpp/sci_saveconsecutivecommands.cpp
+++ b/scilab/modules/history_manager/sci_gateway/cpp/sci_saveconsecutivecommands.cpp
@@ -32,8 +32,6 @@ types::Function::ReturnValue sci_saveconsecutivecommands(types::typed_list &in,
     }
     else if (in.size() == 1)
     {
-        wchar_t* line = NULL;
-
         if ((in[0]->isBool() == false) || (in[0]->getAs<types::Bool>()->isScalar() == false))
         {
             Scierror(999, _("%s: Wrong type for input argument #%d: A boolean expected.\n"), "saveconsecutivecommands", 1);

diff --git a/scilab/modules/history_manager/src/cpp/HistoryFile.cpp b/scilab/modules/history_manager/src/cpp/HistoryFile.cpp
index 29d22ba..e6bdb0e 100644 (file)
--- a/scilab/modules/history_manager/src/cpp/HistoryFile.cpp
+++ b/scilab/modules/history_manager/src/cpp/HistoryFile.cpp
@@ -107,13 +107,7 @@ BOOL HistoryFile::writeToFile(const std::string& _stFilename)
             return FALSE;
         }
 
-#ifdef _MSC_VER
-        wchar_t* filename = to_wide_string(_stFilename.c_str());
-        fOut.open(filename, std::ios::trunc);
-        FREE(filename);
-#else
         fOut.open(_stFilename.c_str(), std::ios::trunc);
-#endif
         if (fOut.is_open() == false)
         {
             return FALSE;