Revert "some warnings on windows x64" 99/1099/1
Pierre MARECHAL [Wed, 23 Jun 2010 13:49:25 +0000 (15:49 +0200)]
This reverts commit 14bc2c865da6042f37e334e965c714c77bcabde2.

scilab/modules/parallel/sci_gateway/cpp/sci_parallel_run.cpp
scilab/modules/parallel/src/c/parallel.vcproj
scilab/modules/parallel/src/cpp/parallel_run.hxx

index 5c95b11..4624494 100644 (file)
@@ -9,12 +9,6 @@
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
-
-#ifdef _MSC_VER
-/* remove warning about : 'std::fill_n': Function call with parameters that may be unsafe */
-#define _SCL_SECURE_NO_WARNINGS
-#endif
-
 extern "C" {
 #include <stdio.h>
 #include "api_scilab.h"
@@ -599,7 +593,7 @@ namespace
                 double* unused;
                 err= allocMatrixOfDouble(pvApiCtx, ++currentTop, 0, 0, &unused);
             }
-            Nbvars = Rhs + Lhs + sciRhs;
+            Nbvars = Rhs+Lhs+sciRhs;
             bool success(byName
                           ? C2F(scistring)(&sciArgPos, scilabFunctionName, &sciLhs, &sciRhs, static_cast<unsigned long>(scilabFunctionNameLength))
                           : C2F(scifunction)(&sciArgPos, &scilabFunction, &sciLhs, &sciRhs)
index 63fb432..5569a12 100644 (file)
                        <File
                                RelativePath="..\..\sci_gateway\cpp\sci_parallel_run.cpp"
                                >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               DisableSpecificWarnings="4800"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               DisableSpecificWarnings="4800"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               DisableSpecificWarnings="4800"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               DisableSpecificWarnings="4800"
-                                       />
-                               </FileConfiguration>
                        </File>
                </Filter>
                <Filter
index bdd3b5b..d5369de 100644 (file)
@@ -303,13 +303,13 @@ namespace
             if (dynamic_scheduling)
             {
 #pragma omp parallel for private(i) schedule(dynamic, chunk_size)
-                for(i=0; (size_t)i < n; ++i)
+                for(i=0; i < n; ++i)
                 {
                     callF(i);
                 }
             } else {
 #pragma omp parallel for private(i)  schedule(static, chunk_size)
-                for(i=0; (size_t)i < n; ++i)
+                for(i=0; i < n; ++i)
                 {
                     callF(i);
                 }