Minor tweaks for Win10 compilation

pongasoft · Mar 30, 2020 · aca36f1 · aca36f1
1 parent 0f49f65
commit aca36f1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/cpp/Model.h b/src/cpp/Model.h
@@ -73,7 +73,7 @@ struct NumSlice
   int_type fIntValue{};
 };
 
-constexpr auto DEFAULT_NUM_SLICES = NumSlice{16};
+constexpr auto DEFAULT_NUM_SLICES = NumSlice{static_cast<NumSlice::int_type>(16)};
 
 //------------------------------------------------------------------------
 // NumSlicesParamConverter: Number of slices is between 1 and NUM_SLICES

diff --git a/src/cpp/Plugin.cpp b/src/cpp/Plugin.cpp
@@ -426,7 +426,7 @@ tresult SampleSplitterParameters::handleRTStateUpgrade(NormalizedState const &iD
     {
       // we handle number of slices (read it from old state / write to new)
       auto oldNumSlices = __deprecated_fNumSlices->readFromState(iDeprecatedState);
-      fNumSlices->writeToState(NumSlice{oldNumSlices}, oNewState);
+      fNumSlices->writeToState(NumSlice{static_cast<NumSlice::int_type>(oldNumSlices)}, oNewState);
 
 //      DLOG_F(INFO, "======>>>>> handleRTStateUpgrade:: upgraded from \n[%s]\n ==> \n[%s]",
 //             iDeprecatedState.toString().c_str(),

diff --git a/src/cpp/RT/SampleSplitterProcessor.cpp b/src/cpp/RT/SampleSplitterProcessor.cpp
@@ -609,7 +609,7 @@ void SampleSplitterProcessor::handlePadSelection()
   auto padBank = *fState.fPadBank;
 
   auto start = padBank * NUM_PADS;
-  auto end = std::min(start + NUM_PADS, numSlices);
+  auto end = std::min(start + NUM_PADS, static_cast<int>(numSlices));
 
   if(fState.fPadBank.hasChanged() || fState.fNumSlices.hasChanged())
   {

diff --git a/src/cpp/SampleSlice.hpp b/src/cpp/SampleSlice.hpp
@@ -328,6 +328,9 @@ class SampleSlice
       case ETransition::kRestarting:
         return iStarting ? ETransition::kRestarting : ETransition::kStopping;
     }
+    // not reached
+    ABORT_F("not reached");
+    return ETransition::kNone;
   }
 
 private: