fix windows compilation after https://codereview.scilab.org/#/c/17272/ 88/17288/1
Antoine ELIAS [Wed, 7 Oct 2015 11:46:50 +0000 (13:46 +0200)]
Change-Id: I19c8f8276d36c444719720c036c28eeec8ec0289

scilab/modules/ast/includes/types/int.hxx
scilab/modules/xcos/src/c/xcos.vcxproj
scilab/modules/xcos/src/c/xcos.vcxproj.filters

index a1f1266..65572e8 100644 (file)
@@ -225,7 +225,7 @@ private :
                 {
                     getUnsignedIntFormat(ArrayOf<T>::get(iPos), &iWidth);
                 }
-                iWidthMax = std::max(iWidthMax, iWidth);
+                iWidthMax = (std::max)(iWidthMax, iWidth);
             }
 
             for (int i = this->m_iRows1PrintState ; i < this->getRows() ; i++)
@@ -338,7 +338,7 @@ private :
                     {
                         getUnsignedIntFormat(ArrayOf<T>::get(iPos), &iWidth);
                     }
-                    piSize[iCols1] = std::max(piSize[iCols1], iWidth);
+                    piSize[iCols1] = (std::max)(piSize[iCols1], iWidth);
                 }
 
                 if (iLen + piSize[iCols1] > iLineLen && iCols1 != iLastCol)
index fbcba59..6cbd426 100644 (file)
   <ItemGroup>
     <ClCompile Include="..\cpp\loadStatus.cpp" />
     <ClCompile Include="..\jni\JavaController_wrap.cxx" />
+    <ClCompile Include="..\jni\XcosCellFactory.cpp" />
     <ClCompile Include="DllmainXCOS.c" />
     <ClCompile Include="..\jni\Modelica.cpp" />
     <ClCompile Include="..\jni\Palette.cpp" />
     <ClInclude Include="..\jni\Modelica.hxx" />
     <ClInclude Include="..\jni\Palette.hxx" />
     <ClInclude Include="..\jni\Xcos.hxx" />
+    <ClInclude Include="..\jni\XcosCellFactory.hxx" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\locales\xcos.pot" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index 6be39f3..abce708 100644 (file)
@@ -92,6 +92,9 @@
     <ClCompile Include="..\jni\JavaController_wrap.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\jni\XcosCellFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\dynlib_xcos.h">
     <ClInclude Include="..\cpp\loadStatus.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\jni\XcosCellFactory.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="core_import.def">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file