[mathicgb] 218/393: Made changes to compile on MSVC without warnings.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository mathicgb.

commit ddf5858b8b5808c85be87994c4c5b94e05bdd0eb
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date:   Wed Apr 3 15:43:42 2013 +0200

    Made changes to compile on MSVC without warnings.
---
 build/vs12/mathicgb-exe/mathicgb-exe.vcxproj         | 2 +-
 build/vs12/mathicgb-lib/mathicgb-lib.vcxproj         | 1 -
 build/vs12/mathicgb-lib/mathicgb-lib.vcxproj.filters | 3 ---
 src/mathicgb/PolyRing.hpp                            | 3 ++-
 src/mathicgb/PrimeField.hpp                          | 3 ++-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/build/vs12/mathicgb-exe/mathicgb-exe.vcxproj b/build/vs12/mathicgb-exe/mathicgb-exe.vcxproj
index b3fecb4..0334965 100755
--- a/build/vs12/mathicgb-exe/mathicgb-exe.vcxproj
+++ b/build/vs12/mathicgb-exe/mathicgb-exe.vcxproj
@@ -384,7 +384,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>C:\projs\mathic\tbb\lib\intel64\vc11;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\projs\mathic\tbb\lib\intel64\vc11\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ProjectReference>
diff --git a/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj b/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj
index 64901bf..914ace1 100755
--- a/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj
+++ b/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj
@@ -471,7 +471,6 @@
     <ClCompile Include="..\..\..\src\mathicgb\PolyHeap.cpp" />
     <ClCompile Include="..\..\..\src\mathicgb\PolyReducer.cpp" />
     <ClCompile Include="..\..\..\src\mathicgb\PolyRing.cpp" />
-    <ClCompile Include="..\..\..\src\mathicgb\PrimeField.cpp" />
     <ClCompile Include="..\..\..\src\mathicgb\QuadMatrix.cpp" />
     <ClCompile Include="..\..\..\src\mathicgb\QuadMatrixBuilder.cpp" />
     <ClCompile Include="..\..\..\src\mathicgb\Reducer.cpp" />
diff --git a/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj.filters b/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj.filters
index 608440b..9542d84 100755
--- a/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj.filters
+++ b/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj.filters
@@ -141,9 +141,6 @@
     <ClCompile Include="..\..\..\src\mathicgb.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\mathicgb\PrimeField.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\mathicgb\BjarkeGeobucket.hpp">
diff --git a/src/mathicgb/PolyRing.hpp b/src/mathicgb/PolyRing.hpp
index 4eb5bba..2036f0c 100755
--- a/src/mathicgb/PolyRing.hpp
+++ b/src/mathicgb/PolyRing.hpp
@@ -3,6 +3,7 @@
 #ifndef _polyRing_h_
 #define _polyRing_h_
 
+#define MATHICGB_USE_MONOID
 #ifdef MATHICGB_USE_MONOID
 #include "MonoMonoid.hpp"
 
@@ -660,7 +661,7 @@ private:
 
 inline exponent PolyRing::weight(ConstMonomial a) const {
 #ifdef MATHICGB_USE_MONOID
-  monoid().degree(a);
+  return monoid().degree(a);
 #else
   MATHICGB_ASSERT(weightsCorrect(a));
   return a[mNumVars + 1];
diff --git a/src/mathicgb/PrimeField.hpp b/src/mathicgb/PrimeField.hpp
index a981b4b..009c8ad 100755
--- a/src/mathicgb/PrimeField.hpp
+++ b/src/mathicgb/PrimeField.hpp
@@ -52,7 +52,8 @@ public:
     static_assert(std::numeric_limits<NoRefInteger>::is_integer, "");
 
     MATHICGB_ASSERT(0 <= i);
-    MATHICGB_ASSERT(i < charac());
+    typedef typename std::make_unsigned<NoRefInteger>::type Unsigned;
+    MATHICGB_ASSERT(static_cast<Unsigned>(i) < charac());
     return Element(i);
   }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathicgb.git