fix the msvc fixes

Author: Jeffrey Hurchalla

montgomery_arithmetic/include/hurchalla/montgomery_arithmetic/detail/experimental/unit_testing_helpers/ConcreteMontgomeryForm.h

@@ -49,24 +49,39 @@ class ConcreteMontgomeryForm final : public AbstractMontgomeryForm<ut_numeric_li
     using U = typename extensible_make_unsigned<T>::type;
 
     struct OpenV : public V {
+#ifndef _MSC_VER
+        auto get() const -> decltype(V::get()) { return V::get(); }
         // for explanation of OT declaration, see
         // https://stackoverflow.com/questions/26435084/how-to-get-the-return-type-of-a-member-function-from-within-a-class
+        using OT = decltype((std::declval<OpenV>().*std::declval<decltype(&OpenV::get)>())());
+#else
         using OT = decltype((std::declval<V>().*std::declval<decltype(&V::get)>())());
         OT get() const { return V::get(); }
+#endif
         OpenV() = default;
         explicit OpenV(OT a) : V(a) {}
         explicit OpenV(V x) : V(x) {}
     };
     struct OpenC : public C {
+#ifndef _MSC_VER
+        auto get() const -> decltype(C::get()) { return C::get(); }
+        using OT = decltype((std::declval<OpenC>().*std::declval<decltype(&OpenC::get)>())());
+#else
         using OT = decltype((std::declval<C>().*std::declval<decltype(&C::get)>())());
         OT get() const { return C::get(); }
+#endif
         OpenC() = default;
         explicit OpenC(OT a) : C(a) {}
         explicit OpenC(C x) : C(x) {}
     };
     struct OpenFV : public FV {
+#ifndef _MSC_VER
+        auto get() const -> decltype(FV::get()) { return FV::get(); }
+        using OT = decltype((std::declval<OpenFV>().*std::declval<decltype(&OpenFV::get)>())());
+#else
         using OT = decltype((std::declval<FV>().*std::declval<decltype(&FV::get)>())());
         OT get() const { return FV::get(); }
+#endif
         OpenFV() = default;
         explicit OpenFV(OT a) : FV(a) {}
         explicit OpenFV(FV x) : FV(x) {}
@@ -84,8 +99,13 @@ class ConcreteMontgomeryForm final : public AbstractMontgomeryForm<ut_numeric_li
 
 
     struct OpenMFV : public MFV {
+#ifndef _MSC_VER
+        auto get() const -> decltype(MFV::get()) { return MFV::get(); }
+        using OT = decltype((std::declval<OpenMFV>().*std::declval<decltype(&OpenMFV::get)>())());
+#else
         using OT = decltype((std::declval<MFV>().*std::declval<decltype(&MFV::get)>())());
         OT get() const { return MFV::get(); }
+#endif
         OpenMFV() = default;
         explicit OpenMFV(OT a) : MFV(a) {}
         explicit OpenMFV(MFV x) : MFV(x) {}
@@ -105,8 +125,13 @@ class ConcreteMontgomeryForm final : public AbstractMontgomeryForm<ut_numeric_li
         }
     };
     struct OpenMFC : public MFC {
+#ifndef _MSC_VER
+        auto get() const -> decltype(MFC::get()) { return MFC::get(); }
+        using OT = decltype((std::declval<OpenMFC>().*std::declval<decltype(&OpenMFC::get)>())());
+#else
         using OT = decltype((std::declval<MFC>().*std::declval<decltype(&MFC::get)>())());
         OT get() const { return MFC::get(); }
+#endif
         OpenMFC() = default;
         explicit OpenMFC(OT a) : MFC(a) {}
         explicit OpenMFC(MFC x) : MFC(x) {}
@@ -126,8 +151,13 @@ class ConcreteMontgomeryForm final : public AbstractMontgomeryForm<ut_numeric_li
         }
     };
     struct OpenMFFV : public MFFV {
+#ifndef _MSC_VER
+        auto get() const -> decltype(MFFV::get()) { return MFFV::get(); }
+        using OT = decltype((std::declval<OpenMFFV>().*std::declval<decltype(&OpenMFFV::get)>())());
+#else
         using OT = decltype((std::declval<MFFV>().*std::declval<decltype(&MFFV::get)>())());
         OT get() const { return MFFV::get(); }
+#endif
         OpenMFFV() = default;
         explicit OpenMFFV(OT a) : MFFV(a) {}
         explicit OpenMFFV(MFFV x) : MFFV(x) {}

montgomery_arithmetic/include/hurchalla/montgomery_arithmetic/detail/impl_montgomery_two_pow.h

@@ -84,7 +84,7 @@ struct impl_montgomery_two_pow {
         HPBC_ASSERT2(numbits > P2);
 
         int shift = numbits - P2;
-        U tmp = n >> shift;
+        U tmp = static_cast<U>(n >> shift);
         HPBC_ASSERT2(tmp <= MASK);
         size_t index = static_cast<size_t>(tmp);
         V result = MFE::twoPowLimited(mf, index);
@@ -130,7 +130,7 @@ struct impl_montgomery_two_pow {
         HPBC_ASSERT2(numbits > (P2 + 1));
 
         int shift = numbits - (P2 + 1);
-        U tmp = n >> shift;
+        U tmp = static_cast<U>(n >> shift);
         HPBC_ASSERT2(tmp <= 2u*MASK + 1u);
         size_t loindex = static_cast<size_t>(tmp) & MASK;
         V val1 = MFE::RTimesTwoPowLimited(mf, loindex, magicValue);
@@ -145,7 +145,7 @@ struct impl_montgomery_two_pow {
                 }
             }
             shift -= (P2 + 1);
-            tmp = n >> shift;
+            tmp = static_cast<U>(n >> shift);
             loindex = static_cast<size_t>(tmp) & MASK;
             val1 = MFE::RTimesTwoPowLimited(mf, loindex, magicValue);
             val2 = MFE::twoPowLimited(mf, loindex);
@@ -236,7 +236,7 @@ struct impl_montgomery_two_pow {
         std::array<V, ARRAY_SIZE> result;
         std::array<U, ARRAY_SIZE> tmp;
         HURCHALLA_REQUEST_UNROLL_LOOP for (size_t j=0; j<ARRAY_SIZE; ++j) {
-            tmp[j] = n[j] >> shift;
+            tmp[j] = static_cast<U>(n[j] >> shift);
             HPBC_ASSERT2(tmp[j] <= MASK);
             // normally we use (tmp & MASK), but it's redundant with tmp <= MASK
             result[j] = MFE::twoPowLimited(mf[j], static_cast<size_t>(tmp[j]));
@@ -247,7 +247,7 @@ struct impl_montgomery_two_pow {
             std::array<size_t, ARRAY_SIZE> index;
             std::array<V, ARRAY_SIZE> tableVal;
             HURCHALLA_REQUEST_UNROLL_LOOP for (size_t j=0; j<ARRAY_SIZE; ++j) {
-                tmp[j] = n[j] >> shift;
+                tmp[j] = static_cast<U>(n[j] >> shift);
                 index[j] = static_cast<size_t>(tmp[j]) & MASK;
                 tableVal[j] = MFE::twoPowLimited(mf[j], index[j]);
             }
@@ -306,7 +306,7 @@ struct impl_montgomery_two_pow {
 
         std::array<V, ARRAY_SIZE> result;
         HURCHALLA_REQUEST_UNROLL_LOOP for (size_t j=0; j<ARRAY_SIZE; ++j) {
-            U tmp = n[j] >> shift;
+            U tmp = static_cast<U>(n[j] >> shift);
             HPBC_ASSERT2(tmp <= MASK);
             size_t index = static_cast<size_t>(tmp);
             result[j] = table[index][j];