Merge remote-tracking branch 'origin/master' into windows
[scilab.git] / scilab / modules / fftw / sci_gateway / cpp / fftw_gw.cpp
index dc14614..660368c 100644 (file)
@@ -2,11 +2,14 @@
 *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 *  Copyright (C) 2014 - Scialb Enterprises - Antoine ELIAS
 *
-*  This file must be used under the terms of the CeCILL.
-*  This source file is licensed as described in the file COPYING, which
-*  you should have received as part of this distribution.  The terms
-*  are also available at
-*  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
 *
 */
 
@@ -14,7 +17,7 @@
 #include "context.hxx"
 #include "overload.hxx"
 
-#define MODULE_NAME L"fftw"
+#define MODULE_NAME "fftw"
 extern "C"
 {
 #include "gw_fftw.h"
@@ -22,15 +25,15 @@ extern "C"
 
 int FFTWModule::Load()
 {
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"loadfftwlibrary", &sci_loadfftwlibrary, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"disposefftwlibrary", &sci_disposefftwlibrary, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"fftwlibraryisloaded", &sci_fftwlibraryisloaded, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"fftw", &sci_fftw, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"fftw_flags", &sci_fftw_flags, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"get_fftw_wisdom", &sci_get_fftw_wisdom, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"set_fftw_wisdom", &sci_set_fftw_wisdom, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"fftw_forget_wisdom", &sci_fftw_forget_wisdom, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"dct", &sci_dct, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"dst", &sci_dst, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(types::Function::createFunction("loadfftwlibrary", &sci_loadfftwlibrary, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(types::Function::createFunction("disposefftwlibrary", &sci_disposefftwlibrary, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(types::Function::createFunction("fftwlibraryisloaded", &sci_fftwlibraryisloaded, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(types::Function::createFunction("fftw", &sci_fftw, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(types::Function::createFunction("fftw_flags", &sci_fftw_flags, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(types::Function::createFunction("get_fftw_wisdom", &sci_get_fftw_wisdom, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(types::Function::createFunction("set_fftw_wisdom", &sci_set_fftw_wisdom, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(types::Function::createFunction("fftw_forget_wisdom", &sci_fftw_forget_wisdom, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(types::Function::createFunction("dct", &sci_dct, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(types::Function::createFunction("dst", &sci_dst, MODULE_NAME));
     return 1;
 }