X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=scilab%2Fmodules%2Fsignal_processing%2Fsrc%2Fcpp%2Fsignalprocessingfunctions.hxx;h=cfcedd83835185a623c50d1378f8e6c0d9270585;hp=a7c09ef7c1f67579e1dbe5b82adac584873b3dea;hb=ff9d2b23c6b3e9754b8a9f597cd026261b307c38;hpb=832981331d66ca6a5d1928c7b43814eca975967b diff --git a/scilab/modules/signal_processing/src/cpp/signalprocessingfunctions.hxx b/scilab/modules/signal_processing/src/cpp/signalprocessingfunctions.hxx index a7c09ef..cfcedd8 100644 --- a/scilab/modules/signal_processing/src/cpp/signalprocessingfunctions.hxx +++ b/scilab/modules/signal_processing/src/cpp/signalprocessingfunctions.hxx @@ -45,7 +45,7 @@ class SIGNAL_PROCESSING_IMPEXP Signalprocessingfunctions { public : - Signalprocessingfunctions(std::wstring callerName); + Signalprocessingfunctions(const std::string& callerName); ~Signalprocessingfunctions(); void setDgetx(types::Callable*); @@ -66,8 +66,8 @@ public : private : std::vector m_FArgs; - std::map m_staticFunctionMap; - std::wstring m_wstrCaller; + std::map m_staticFunctionMap; + std::string m_strCaller; types::Callable* m_pCallDgetx; types::Callable* m_pCallDgety; @@ -91,7 +91,7 @@ class SIGNAL_PROCESSING_IMPEXP Signalprocessing { // differential equation functions private : - static std::map<__threadId, Signalprocessingfunctions*> m_mapSignalprocessingfunctions; + static Signalprocessingfunctions* m_Signalprocessingfunctions; public : static void addSignalprocessingfunctions(Signalprocessingfunctions* _spFunction);