Modified CMake to use GSL 3.0.1, and replaced gsl::span::index_type w…

…ith size_type.
SpiRITlab · Apr 28, 2020 · c40a233 · c40a233
1 parent 1bcd219
commit c40a233
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/native/src/seal/batchencoder.cpp b/native/src/seal/batchencoder.cpp
@@ -224,7 +224,7 @@ namespace seal
 
         // First write the values to destination coefficients. Read
         // in top row, then bottom row.
-        using index_type = decltype(values_matrix)::index_type;
+        using index_type = decltype(values_matrix)::size_type;
         for (size_t i = 0; i < values_matrix_size; i++)
         {
             *(destination.data() + matrix_reps_index_map_[i]) = values_matrix[static_cast<index_type>(i)];
@@ -267,7 +267,7 @@ namespace seal
 
         // First write the values to destination coefficients. Read
         // in top row, then bottom row.
-        using index_type = decltype(values_matrix)::index_type;
+        using index_type = decltype(values_matrix)::size_type;
         for (size_t i = 0; i < values_matrix_size; i++)
         {
             *(destination.data() + matrix_reps_index_map_[i]) =
@@ -436,7 +436,7 @@ namespace seal
 
         auto &context_data = *context_->first_context_data();
 
-        using index_type = decltype(destination)::index_type;
+        using index_type = decltype(destination)::size_type;
         if (unsigned_gt(destination.size(), numeric_limits<int>::max()) || unsigned_neq(destination.size(), slots_))
         {
             throw invalid_argument("destination has incorrect size");
@@ -479,7 +479,7 @@ namespace seal
         auto &context_data = *context_->first_context_data();
         uint64_t modulus = context_data.parms().plain_modulus().value();
 
-        using index_type = decltype(destination)::index_type;
+        using index_type = decltype(destination)::size_type;
         if (unsigned_gt(destination.size(), numeric_limits<int>::max()) || unsigned_neq(destination.size(), slots_))
         {
             throw invalid_argument("destination has incorrect size");

diff --git a/thirdparty/msgsl/CMakeLists.txt b/thirdparty/msgsl/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 cmake_minimum_required(VERSION 3.12)
 
-project(MSGSL_DOWNLOAD VERSION 2.1.0)
+project(MSGSL_DOWNLOAD VERSION 3.0.1)
 
 if(EXISTS cache_init.txt)
     set(MSGSL_CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DGSL_TEST=OFF -C../cache_init.txt)