Merge pull request electronicarts#483 from electronicarts/test_ci_for_iterator_categories

Test ci for iterator categories

Author: grojo-ea

.github/workflows/c-cpp.yml

@@ -30,6 +30,7 @@ jobs:
         os: [ windows-latest, ubuntu-latest ]
         compiler: [ clang, gcc, msvc ]
         configuration: [ Debug, Release ]
+        std_iter_compatibility: [ std_iter_category_disabled, std_iter_category_enabled ]
         exclude:
           - os: windows-latest
             compiler: gcc
@@ -63,7 +64,7 @@ jobs:
           path: Code/
 
       - run: mkdir build
-      - run: cd build && cmake ../Code -DEASTL_BUILD_BENCHMARK:BOOL=ON -DEASTL_BUILD_TESTS:BOOL=ON
+      - run: cd build && cmake ../Code -DEASTL_BUILD_BENCHMARK:BOOL=ON -DEASTL_BUILD_TESTS:BOOL=ON -DEASTL_STD_ITERATOR_CATEGORY_ENABLED:BOOL=${{ contains(matrix.std_iter_compatibility, 'enabled') && 'ON' || 'OFF' }}
         env:
           CXXFLAGS: ${{ matrix.cxxflags }}
           CXX: ${{ matrix.cxx }}

CMakeLists.txt

@@ -9,6 +9,7 @@ project(EASTL CXX)
 #-------------------------------------------------------------------------------------------
 option(EASTL_BUILD_BENCHMARK "Enable generation of build files for benchmark" OFF)
 option(EASTL_BUILD_TESTS "Enable generation of build files for tests" OFF)
+option(EASTL_STD_ITERATOR_CATEGORY_ENABLED "Enable compatibility with std:: iterator categories" OFF)
 
 #-------------------------------------------------------------------------------------------
 # Compiler Flags
@@ -37,6 +38,9 @@ add_definitions(-D_CHAR16T)
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 add_definitions(-DEASTL_OPENSOURCE=1)
+if (EASTL_STD_ITERATOR_CATEGORY_ENABLED)
+  add_definitions(-DEASTL_STD_ITERATOR_CATEGORY_ENABLED=1)
+endif()
 
 #-------------------------------------------------------------------------------------------
 # Include dirs

benchmark/CMakeLists.txt

@@ -58,6 +58,9 @@ add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 add_definitions(-DEASTL_THREAD_SUPPORT_AVAILABLE=0)
 add_definitions(-DEASTL_OPENSOURCE=1)
 add_definitions(-D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS)  # silence std::hash_map deprecation warnings
+if (EASTL_STD_ITERATOR_CATEGORY_ENABLED)
+  add_definitions(-DEASTL_STD_ITERATOR_CATEGORY_ENABLED=1)
+endif()
 
 if(NOT EASTL_BUILD_TESTS)
     add_subdirectory(../test/packages/EAStdC ../test/EAStdC)

test/CMakeLists.txt

@@ -17,6 +17,9 @@ add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 add_definitions(-DEASTL_OPENSOURCE=1)
 add_definitions(-D_CHAR16T)
 add_definitions(-DEASTL_THREAD_SUPPORT_AVAILABLE=0)
+if (EASTL_STD_ITERATOR_CATEGORY_ENABLED)
+  add_definitions(-DEASTL_STD_ITERATOR_CATEGORY_ENABLED=1)
+endif()
 
 #-------------------------------------------------------------------------------------------
 # Compiler Flags