Merge pull request #65 from ami-iit/fix-permissive

Fix permissive
ami-iit · Jan 20, 2023 · 86769a7 · 86769a7
2 parents e951ef3 + 3cff03d
commit 86769a7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/conda-forge-ci.yml b/.github/workflows/conda-forge-ci.yml
@@ -23,9 +23,8 @@ jobs:
 
     - uses: conda-incubator/setup-miniconda@v2
       with:
-        mamba-version: "*"
-        channels: conda-forge,defaults
-        channel-priority: true
+        miniforge-variant: Mambaforge
+        miniforge-version: latest
 
     - name: Dependencies
       shell: bash -l {0}
@@ -49,7 +48,7 @@ jobs:
       run: |
         mkdir -p build
         cd build
-        cmake -G"Visual Studio 16 2019" -DBUILD_TESTING:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ..
+        cmake -G"Visual Studio 16 2019" -DBUILD_TESTING:BOOL=ON -DDISABLE_PERMISSIVE:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ..
 
     - name: Build
       shell: bash -l {0}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,6 +31,9 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 # installation directories.
 if(MSVC)
     set(CMAKE_DEBUG_POSTFIX "d")
+
+    option(DISABLE_PERMISSIVE "Add the /permissive- flag to MSVC" OFF)
+    mark_as_advanced(DISABLE_PERMISSIVE)
 endif()
 
 # Build position independent code.
@@ -188,6 +191,12 @@ if (Eigen3_FOUND)
 endif()
 
 target_compile_features(matioCpp PUBLIC cxx_std_14)
+if(DISABLE_PERMISSIVE)
+    message(STATUS "Adding /permissive- flag.")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /permissive-")
+    add_compile_options(/permissive-)
+endif()
 
 set_target_properties(matioCpp PROPERTIES
   OUTPUT_NAME matioCpp

diff --git a/include/matioCpp/impl/MultiDimensionalArray.tpp b/include/matioCpp/impl/MultiDimensionalArray.tpp
@@ -65,7 +65,7 @@ matioCpp::MultiDimensionalArray<T>::MultiDimensionalArray(const std::string &nam
 }
 
 template<typename T>
-matioCpp::MultiDimensionalArray<T>::MultiDimensionalArray(const std::string &name, const std::vector<matioCpp::MultiDimensionalArray<T>::index_type> &dimensions)
+matioCpp::MultiDimensionalArray<T>::MultiDimensionalArray(const std::string &name, const std::vector<typename matioCpp::MultiDimensionalArray<T>::index_type> &dimensions)
 {
     matioCpp::MultiDimensionalArray<T>::index_type totalElements = 1;
     for (matioCpp::MultiDimensionalArray<T>::index_type dim : dimensions)
@@ -88,7 +88,7 @@ matioCpp::MultiDimensionalArray<T>::MultiDimensionalArray(const std::string &nam
 }
 
 template<typename T>
-matioCpp::MultiDimensionalArray<T>::MultiDimensionalArray(const std::string &name, const std::vector<matioCpp::MultiDimensionalArray<T>::index_type> &dimensions, matioCpp::MultiDimensionalArray<T>::const_pointer inputVector)
+matioCpp::MultiDimensionalArray<T>::MultiDimensionalArray(const std::string &name, const std::vector<typename matioCpp::MultiDimensionalArray<T>::index_type> &dimensions, matioCpp::MultiDimensionalArray<T>::const_pointer inputVector)
 {
     for (matioCpp::MultiDimensionalArray<T>::index_type dim : dimensions)
     {
@@ -316,13 +316,13 @@ typename matioCpp::MultiDimensionalArray<T>::value_type matioCpp::MultiDimension
 }
 
 template<typename T>
-typename matioCpp::MultiDimensionalArray<T>::reference matioCpp::MultiDimensionalArray<T>::operator[](const std::vector<matioCpp::MultiDimensionalArray<T>::index_type> &el)
+typename matioCpp::MultiDimensionalArray<T>::reference matioCpp::MultiDimensionalArray<T>::operator[](const std::vector<typename matioCpp::MultiDimensionalArray<T>::index_type> &el)
 {
     return data()[rawIndexFromIndices(el)];
 }
 
 template<typename T>
-typename matioCpp::MultiDimensionalArray<T>::value_type matioCpp::MultiDimensionalArray<T>::operator[](const std::vector<matioCpp::MultiDimensionalArray<T>::index_type> &el) const
+typename matioCpp::MultiDimensionalArray<T>::value_type matioCpp::MultiDimensionalArray<T>::operator[](const std::vector<typename matioCpp::MultiDimensionalArray<T>::index_type> &el) const
 {
     return data()[rawIndexFromIndices(el)];
 }