From 0e0b85f0af2361510bd85740cb19ee41c2319fc4 Mon Sep 17 00:00:00 2001 From: Alex Dyachenko Date: Sat, 13 May 2017 20:42:45 -0400 Subject: [PATCH] MPIR.Net - resolved build warnings --- mpir.net/build.vc11/mpir.net/mpir.net.vcxproj | 8 ++++---- mpir.net/build.vc12/mpir.net/mpir.net.vcxproj | 8 ++++---- mpir.net/build.vc14/mpir.net/mpir.net.vcxproj | 8 ++++---- mpir.net/mpir.net/HugeInt.h | 3 +-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/mpir.net/build.vc11/mpir.net/mpir.net.vcxproj b/mpir.net/build.vc11/mpir.net/mpir.net.vcxproj index 0f09cb4a..6405b47c 100644 --- a/mpir.net/build.vc11/mpir.net/mpir.net.vcxproj +++ b/mpir.net/build.vc11/mpir.net/mpir.net.vcxproj @@ -96,7 +96,7 @@ true ..\..\..\lib\$(Platform)\$(Configuration)\mpir.lib - LIBCMT;%(IgnoreSpecificDefaultLibraries) + LIBCMTD;LIBCMT;%(IgnoreSpecificDefaultLibraries) cd $(SolutionDir)..\build.vc @@ -114,7 +114,7 @@ check_config $(Platform) $(Configuration) 11 true ..\..\..\lib\$(Platform)\$(Configuration)\mpir.lib - LIBCMT;%(IgnoreSpecificDefaultLibraries) + LIBCMTD;LIBCMT;%(IgnoreSpecificDefaultLibraries) cd $(SolutionDir)..\build.vc @@ -131,7 +131,7 @@ check_config $(Platform) $(Configuration) 11 true ..\..\..\lib\$(Platform)\$(Configuration)\mpir.lib - LIBCMT;%(IgnoreSpecificDefaultLibraries) + LIBCMTD;LIBCMT;%(IgnoreSpecificDefaultLibraries) cd $(SolutionDir)..\build.vc @@ -148,7 +148,7 @@ check_config $(Platform) $(Configuration) 11 true ..\..\..\lib\$(Platform)\$(Configuration)\mpir.lib - LIBCMT;%(IgnoreSpecificDefaultLibraries) + LIBCMTD;LIBCMT;%(IgnoreSpecificDefaultLibraries) cd $(SolutionDir)..\build.vc diff --git a/mpir.net/build.vc12/mpir.net/mpir.net.vcxproj b/mpir.net/build.vc12/mpir.net/mpir.net.vcxproj index 261ec0b2..91dabcc6 100644 --- a/mpir.net/build.vc12/mpir.net/mpir.net.vcxproj +++ b/mpir.net/build.vc12/mpir.net/mpir.net.vcxproj @@ -96,7 +96,7 @@ true ..\..\..\lib\$(Platform)\$(Configuration)\mpir.lib - LIBCMT;%(IgnoreSpecificDefaultLibraries) + LIBCMTD;LIBCMT;%(IgnoreSpecificDefaultLibraries) cd $(SolutionDir)..\build.vc @@ -114,7 +114,7 @@ check_config $(Platform) $(Configuration) 12 true ..\..\..\lib\$(Platform)\$(Configuration)\mpir.lib - LIBCMT;%(IgnoreSpecificDefaultLibraries) + LIBCMTD;LIBCMT;%(IgnoreSpecificDefaultLibraries) cd $(SolutionDir)..\build.vc @@ -131,7 +131,7 @@ check_config $(Platform) $(Configuration) 12 true ..\..\..\lib\$(Platform)\$(Configuration)\mpir.lib - LIBCMT;%(IgnoreSpecificDefaultLibraries) + LIBCMTD;LIBCMT;%(IgnoreSpecificDefaultLibraries) cd $(SolutionDir)..\build.vc @@ -148,7 +148,7 @@ check_config $(Platform) $(Configuration) 12 true ..\..\..\lib\$(Platform)\$(Configuration)\mpir.lib - LIBCMT;%(IgnoreSpecificDefaultLibraries) + LIBCMTD;LIBCMT;%(IgnoreSpecificDefaultLibraries) cd $(SolutionDir)..\build.vc diff --git a/mpir.net/build.vc14/mpir.net/mpir.net.vcxproj b/mpir.net/build.vc14/mpir.net/mpir.net.vcxproj index fad54d8b..07ca3d2a 100644 --- a/mpir.net/build.vc14/mpir.net/mpir.net.vcxproj +++ b/mpir.net/build.vc14/mpir.net/mpir.net.vcxproj @@ -96,7 +96,7 @@ true ..\..\..\lib\$(Platform)\$(Configuration)\mpir.lib - LIBCMT;%(IgnoreSpecificDefaultLibraries) + LIBCMTD;LIBCMT;%(IgnoreSpecificDefaultLibraries) cd $(SolutionDir)..\build.vc @@ -114,7 +114,7 @@ check_config $(Platform) $(Configuration) 14 true ..\..\..\lib\$(Platform)\$(Configuration)\mpir.lib - LIBCMT;%(IgnoreSpecificDefaultLibraries) + LIBCMTD;LIBCMT;%(IgnoreSpecificDefaultLibraries) cd $(SolutionDir)..\build.vc @@ -131,7 +131,7 @@ check_config $(Platform) $(Configuration) 14 true ..\..\..\lib\$(Platform)\$(Configuration)\mpir.lib - LIBCMT;%(IgnoreSpecificDefaultLibraries) + LIBCMTD;LIBCMT;%(IgnoreSpecificDefaultLibraries) cd $(SolutionDir)..\build.vc @@ -148,7 +148,7 @@ check_config $(Platform) $(Configuration) 14 true ..\..\..\lib\$(Platform)\$(Configuration)\mpir.lib - LIBCMT;%(IgnoreSpecificDefaultLibraries) + LIBCMTD;LIBCMT;%(IgnoreSpecificDefaultLibraries) cd $(SolutionDir)..\build.vc diff --git a/mpir.net/mpir.net/HugeInt.h b/mpir.net/mpir.net/HugeInt.h index 5ddf9cf2..151696f8 100644 --- a/mpir.net/mpir.net/HugeInt.h +++ b/mpir.net/mpir.net/HugeInt.h @@ -1037,7 +1037,6 @@ namespace MPIR public: -#define _GMP_VERSION __GNU_MP_VERSION + "." + __GNU_MP_VERSION_MINOR + "." + __GNU_MP_VERSION_PATCHLEVEL #undef GMP_VERSION /// @@ -1058,7 +1057,7 @@ namespace MPIR /// /// Represents the version of GMP with which the underlying MPIR library is compatible /// - static initonly const Version^ GMP_VERSION = gcnew Version(_GMP_VERSION); + static initonly const Version^ GMP_VERSION = gcnew Version(__GNU_MP_VERSION, __GNU_MP_VERSION_MINOR, __GNU_MP_VERSION_PATCHLEVEL); /// /// Represents the version of the underlying MPIR library