From: Pierre MARECHAL <pierre.marechal@scilab.org>
Date: Wed, 23 Jun 2010 13:49:25 +0000 (+0200)
Subject: Revert "some warnings on windows x64"
X-Git-Tag: 5.3.0-beta-1~71
X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=3a7f210627b6767e29c2de7cd03a6140b5896db0

Revert "some warnings on windows x64"

This reverts commit 14bc2c865da6042f37e334e965c714c77bcabde2.
---

diff --git a/scilab/modules/parallel/sci_gateway/cpp/sci_parallel_run.cpp b/scilab/modules/parallel/sci_gateway/cpp/sci_parallel_run.cpp
index 5c95b11..4624494 100644
--- a/scilab/modules/parallel/sci_gateway/cpp/sci_parallel_run.cpp
+++ b/scilab/modules/parallel/sci_gateway/cpp/sci_parallel_run.cpp
@@ -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)
diff --git a/scilab/modules/parallel/src/c/parallel.vcproj b/scilab/modules/parallel/src/c/parallel.vcproj
index 63fb432..5569a12 100644
--- a/scilab/modules/parallel/src/c/parallel.vcproj
+++ b/scilab/modules/parallel/src/c/parallel.vcproj
@@ -390,38 +390,6 @@
 			<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
diff --git a/scilab/modules/parallel/src/cpp/parallel_run.hxx b/scilab/modules/parallel/src/cpp/parallel_run.hxx
index bdd3b5b..d5369de 100644
--- a/scilab/modules/parallel/src/cpp/parallel_run.hxx
+++ b/scilab/modules/parallel/src/cpp/parallel_run.hxx
@@ -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);
                 }