Enable C++11 compatibility (#16)

* first working version for C++11

* files forgotten

* fixed bug in ZipWithStdVectorUnequalSizesThrowsTest

* using C++11 by default

* pretty formatting to custom gcc script

* Update README.md

* enabling actions for C++11 and C++17

* fixed yml syntax

* replaced matrix.config.os with name

* forgotten continuation for C++17 in terminal

* windows compiler: 'init-statements in if/switch' requires compiler flag '/std:c++17'

* fixed another init-statement in if

* removed build option to C++17

* generic replacement for optional based on PR feedback

* Added date to credit

Author: jkalias

.github/workflows/cmake.yml

@@ -21,7 +21,7 @@ jobs:
       matrix:
         config: 
         - {
-            name: "Windows Latest MSVC",
+            name: "Windows Latest MSVC (C++11)",
             os: windows-latest,
             build_type: "Debug",
             cc: "cl",
@@ -30,15 +30,40 @@ jobs:
             generators: "Visual Studio 16 2019"
           }
         - {
-            name: "Ubuntu Latest GCC",
+            name: "Windows Latest MSVC (C++17)",
+            os: windows-latest,
+            build_type: "Debug",
+            cc: "cl",
+            cxx: "cl",
+            environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
+            generators: "Visual Studio 16 2019"
+          }
+        - {
+            name: "Ubuntu Latest GCC (C++11)",
             os: ubuntu-latest,
             build_type: "Debug",
             cc: "gcc",
             cxx: "g++",
             generators: "Ninja"
           }
         - {
-            name: "macOS Latest Clang",
+            name: "Ubuntu Latest GCC (C++17)",
+            os: ubuntu-latest,
+            build_type: "Debug",
+            cc: "gcc",
+            cxx: "g++",
+            generators: "Ninja"
+          }
+        - {
+            name: "macOS Latest Clang (C++11)",
+            os: macos-latest,
+            build_type: "Debug",
+            cc: "clang",
+            cxx: "clang++",
+            generators: "Xcode"
+          }
+        - {
+            name: "macOS Latest Clang (C++17)",
             os: macos-latest,
             build_type: "Debug",
             cc: "clang",
@@ -54,6 +79,7 @@ jobs:
         run: |
           echo github.event.action: ${{ github.event.action }}
           echo github.event_name: ${{ github.event_name }}
+
       - name: Install dependencies on windows
         if: startsWith(matrix.config.os, 'windows')
         run: |
@@ -69,21 +95,35 @@ jobs:
           ninja --version
           cmake --version
           gcc --version
+
       - name: Install dependencies on macos
         if: startsWith(matrix.config.os, 'macos')
         run: |
           brew install cmake ninja
           ninja --version
           cmake --version
           
-      - name: Configure
+      - name: Configure C++11
+        shell: bash
+        if: contains(matrix.config.name, 'C++11')
+        run: |
+          mkdir build
+          cmake \
+            -S . \
+            -B build \
+            -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
+            -G "${{ matrix.config.generators }}"
+      
+      - name: Configure C++17
         shell: bash
+        if: contains(matrix.config.name, 'C++17')
         run: |
           mkdir build
           cmake \
             -S . \
             -B build \
             -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
+            -DCMAKE_CXX_STANDARD=17 \
             -G "${{ matrix.config.generators }}"
 
       - name: Build

.gitignore

@@ -10,4 +10,7 @@ compile_commands.json
 CTestTestfile.cmake
 _deps
 build/
+build_cpp11/
+build_cpp17/
+build_gcc/
 /.vs

CMakeLists.txt

@@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.14)
 project(functional_vector VERSION 0.9)
 
 # GoogleTest requires at least C++11
-set(CMAKE_CXX_STANDARD 17)
+if(NOT "${CMAKE_CXX_STANDARD}")
+  set(CMAKE_CXX_STANDARD 11)
+endif()
+message("-- C++ standard version: ${CMAKE_CXX_STANDARD}")
 
 # For Windows: Prevent overriding the parent project's compiler/linker settings
 if(CMAKE_HOST_WIN32)
@@ -36,4 +39,4 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 # Include the testing subdirectory
 add_subdirectory(src)
-add_subdirectory(tests)
+add_subdirectory(tests)

README.md

@@ -10,17 +10,38 @@ This is heavily influenced and inspired by C# and Swift.
 * CMake >= 3.14
 
 ### Minimum C++ version
-* C++17
+* C++11
 
-An out-of-source build strategy is used. All following examples assume an output build folder named ```build```.
+An out-of-source build strategy is used. All following examples assume an output build folder named ```build```. If no additional argument is passed to CMake, C++11 is used. Otherwise, you can pass ```-DCMAKE_CXX_STANDARD=17``` and it will use C++17 for example.
 ### macOS (Xcode)
 ```console
 cd functional_vector
 cmake -S . -B build -G Xcode
 ```
 Then open the generated ```functional_vector.xcodeproj``` in the ```build``` folder.
 
-### macOS and Linux (Makefiles)
+### macOS (Makefiles/clang)
+```console
+cd functional_vector
+cmake -S . -B build
+cmake --build build
+build/tests/unit_tests
+```
+
+### macOS (Makefiles/g++)
+Assuming you have installed Homebrew, then you can use the gcc and g++ compilers by doing the following (this example uses version gcc 11)
+```console
+cd functional_vector
+cmake \
+    -S . \
+    -B build \
+    -DCMAKE_C_COMPILER=/opt/homebrew/Cellar/gcc/11.2.0/bin/gcc-11 \
+    -DCMAKE_CXX_COMPILER=/opt/homebrew/Cellar/gcc/11.2.0/bin/g++-11
+cmake --build build
+build/tests/unit_tests
+```
+
+### Linux (Makefiles)
 ```console
 cd functional_vector
 cmake -S . -B build

include/compatibility.h

@@ -0,0 +1,27 @@
+// MIT License
+//
+// Copyright (c) 2021 Ioannis Kaliakatsos
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#pragma once
+
+#if __cplusplus >= 201703L
+#define CPP17_AVAILABLE
+#endif

include/export_def.h

@@ -30,4 +30,6 @@
     #endif
 #else
     #define FunctionalVectorExport __attribute__ ((__visibility__("default")))
-#endif
+#endif
+
+#include "compatibility.h"