diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml index ea07e377..71e06811 100644 --- a/.github/workflows/clang.yml +++ b/.github/workflows/clang.yml @@ -1,7 +1,7 @@ name: clang on: push: - branches: [ master ] + branches: [ master, development ] pull_request: branches: [ master ] @@ -22,7 +22,7 @@ jobs: sudo apt-get install -y "clang-9" "lldb-9" "lld-9" "clang-format-9" export CC=clang-9 export CXX=clang++-9 - cmake -D BUILD_TESTS=ON ./ + cmake -D BUILD_TESTS=ON -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF ./ clang --version make @@ -41,7 +41,7 @@ jobs: - name: Build run: | - cmake -DBUILD_TESTS=ON -DNO_STL=ON ./ + cmake -DBUILD_TESTS=ON -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF ./ gcc --version make @@ -62,7 +62,7 @@ jobs: run: | export CC=clang export CXX=clang++ - cmake -D BUILD_TESTS=ON ./ + cmake -D BUILD_TESTS=ON -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF ./ clang --version make @@ -83,7 +83,7 @@ jobs: run: | export CC=clang export CXX=clang++ - cmake -D BUILD_TESTS=ON -DNO_STL=ON ./ + cmake -D BUILD_TESTS=ON -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF ./ clang --version make diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 5e1ea8f1..0870442b 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -1,7 +1,7 @@ name: gcc on: push: - branches: [ master ] + branches: [ master, development ] pull_request: branches: [ master ] @@ -18,7 +18,7 @@ jobs: - name: Build run: | - cmake -DBUILD_TESTS=ON ./ + cmake -DBUILD_TESTS=ON -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF ./ gcc --version make @@ -37,7 +37,7 @@ jobs: - name: Build run: | - cmake -DBUILD_TESTS=ON -DNO_STL=ON ./ + cmake -DBUILD_TESTS=ON -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF ./ gcc --version make diff --git a/.github/workflows/vs2019.yml b/.github/workflows/vs2019.yml index 8eedf4aa..11ee107f 100644 --- a/.github/workflows/vs2019.yml +++ b/.github/workflows/vs2019.yml @@ -1,7 +1,7 @@ name: vs2019 on: push: - branches: [ master] + branches: [ master, development ] pull_request: branches: [ master ] @@ -21,7 +21,7 @@ jobs: - name: Build run: | - cmake -G "Visual Studio 16 2019" -DBUILD_TESTS=ON ./ + cmake -G "Visual Studio 16 2019" -DBUILD_TESTS=ON -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF ./ MSBuild.exe -version MSBuild.exe etl.sln @@ -43,7 +43,7 @@ jobs: - name: Build run: | - cmake -G "Visual Studio 16 2019" -DBUILD_TESTS=ON -DNO_STL=ON ./ + cmake -G "Visual Studio 16 2019" -DBUILD_TESTS=ON -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF ./ MSBuild.exe -version MSBuild.exe etl.sln diff --git a/include/etl/type_traits.h b/include/etl/type_traits.h index 82bf041d..a9fad8cf 100644 --- a/include/etl/type_traits.h +++ b/include/etl/type_traits.h @@ -1559,7 +1559,7 @@ namespace etl struct is_trivially_constructible; #endif - //*************************************************************************** + //********************************************* // is_trivially_copy_constructible #if ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED template @@ -1579,7 +1579,7 @@ namespace etl struct is_trivially_copy_constructible; #endif - //*************************************************************************** + //********************************************* // is_trivially_destructible #if ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED template @@ -1599,7 +1599,7 @@ namespace etl struct is_trivially_destructible; #endif - //*************************************************************************** + //********************************************* // is_trivially_copy_assignable #if ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED template @@ -1619,7 +1619,7 @@ namespace etl struct is_trivially_copy_assignable; #endif - //*************************************************************************** + //********************************************* // is_trivially_copyable #if ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED template @@ -1644,27 +1644,45 @@ namespace etl //********************************************* // Use the compiler's builtins. //********************************************* - + //********************************************* // is_assignable template - struct is_assignable : public etl::bool_constant<__is_assignable(T1, T2)> + struct is_assignable { + static ETL_CONSTANT bool value = __is_assignable(T1, T2); }; -#if ETL_CPP11_SUPPORTED + #if ETL_CPP11_SUPPORTED //********************************************* // is_constructible template - struct is_constructible : public etl::bool_constant<__is_constructible(T, TArgs...)> + struct is_constructible { + static ETL_CONSTANT bool value = __is_constructible(T, TArgs...); }; -#endif + #else + //********************************************* + // is_constructible + template + struct is_constructible + { + static ETL_CONSTANT bool value = __is_constructible(T, TArgs); + }; + + //********************************************* + // is_constructible + template + struct is_constructible + { + static ETL_CONSTANT bool value = __is_constructible(T); + }; + #endif //********************************************* // is_copy_constructible template - struct is_copy_constructible : public etl::is_constructible> + struct is_copy_constructible : public etl::is_constructible::type> { }; @@ -1675,39 +1693,85 @@ namespace etl { }; +#if ETL_CPP11_SUPPORTED + //********************************************* + // is_trivially_constructible + template + struct is_trivially_constructible + { + #if defined(ETL_COMPILER_GCC) + static ETL_CONSTANT bool value = __has_trivial_constructor(T); + #else + static ETL_CONSTANT bool value = __is_trivially_constructible(T, TArgs...); + #endif + }; +#else + //********************************************* + // is_trivially_constructible + template + struct is_trivially_constructible + { +#if defined(ETL_COMPILER_GCC) + static ETL_CONSTANT bool value = __has_trivial_constructor(T); +#else + static ETL_CONSTANT bool value = __is_trivially_constructible(T, TArgs); +#endif + }; + //********************************************* // is_trivially_constructible template - struct is_trivially_constructible : public etl::bool_constant<__is_trivially_constructible(T)> + struct is_trivially_constructible { +#if defined(ETL_COMPILER_GCC) + static ETL_CONSTANT bool value = __has_trivial_constructor(T); +#else + static ETL_CONSTANT bool value = __is_trivially_constructible(T); +#endif }; +#endif - //*************************************************************************** + //********************************************* // is_trivially_copy_constructible template - struct is_trivially_copy_constructible : public etl::bool_constant<__is_trivially_copyable(T)> + struct is_trivially_copy_constructible : public is_trivially_constructible::type> { }; - //*************************************************************************** + //********************************************* // is_trivially_destructible template - struct is_trivially_destructible : public etl::bool_constant<__is_trivially_destructible(T)> + struct is_trivially_destructible { + #if defined(ETL_COMPILER_GCC) + static ETL_CONSTANT bool value = __has_trivial_destructor(T); + #else + static ETL_CONSTANT bool value = __is_trivially_destructible(T); + #endif }; - //*************************************************************************** + //********************************************* // is_trivially_copy_assignable template - struct is_trivially_copy_assignable : public etl::bool_constant<__is_trivially_copyable(T)> + struct is_trivially_copy_assignable { + #if defined(ETL_COMPILER_GCC) + static ETL_CONSTANT bool value = __has_trivial_copy(T); + #else + static ETL_CONSTANT bool value = __is_trivially_copyable(T); + #endif }; - //*************************************************************************** + //********************************************* // is_trivially_copyable template - struct is_trivially_copyable : public etl::bool_constant<__is_trivially_copyable(T)> + struct is_trivially_copyable { + #if defined(ETL_COMPILER_GCC) + static ETL_CONSTANT bool value = __has_trivial_copy(T); + #else + static ETL_CONSTANT bool value = __is_trivially_copyable(T); + #endif }; #elif defined(ETL_USER_DEFINED_TYPE_TRAITS) && !defined(ETL_USE_TYPE_TRAITS_BUILTINS) @@ -1791,7 +1855,7 @@ namespace etl template struct is_trivially_constructible; - //*************************************************************************** + //********************************************* // is_trivially_copy_constructible template ::value || etl::is_pointer::value> struct is_trivially_copy_constructible; @@ -1804,7 +1868,7 @@ namespace etl template struct is_trivially_copy_constructible; - //*************************************************************************** + //********************************************* // is_trivially_destructible template ::value || etl::is_pointer::value> struct is_trivially_destructible; @@ -1817,7 +1881,7 @@ namespace etl template struct is_trivially_destructible; - //*************************************************************************** + //********************************************* // is_trivially_copy_assignable template ::value || etl::is_pointer::value> struct is_trivially_copy_assignable; @@ -1830,7 +1894,7 @@ namespace etl template struct is_trivially_copy_assignable; - //*************************************************************************** + //********************************************* // is_trivially_copyable template ::value || etl::is_pointer::value> struct is_trivially_copyable; @@ -1887,28 +1951,28 @@ namespace etl { }; - //*************************************************************************** + //********************************************* // is_trivially_copy_constructible template struct is_trivially_copy_constructible : public etl::bool_constant::value || etl::is_pointer::value> { }; - //*************************************************************************** + //********************************************* // is_trivially_destructible template struct is_trivially_destructible : public etl::bool_constant::value || etl::is_pointer::value> { }; - //*************************************************************************** + //********************************************* // is_trivially_copy_assignable template struct is_trivially_copy_assignable : public etl::bool_constant::value || etl::is_pointer::value> { }; - //*************************************************************************** + //********************************************* // is_trivially_copyable template struct is_trivially_copyable : public etl::bool_constant::value || etl::is_pointer::value> diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a9780307..022d6608 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -12,6 +12,16 @@ else() message(STATUS "Compiling for STL") endif() +if (ETL_USE_TYPE_TRAITS_BUILTINS) + message(STATUS "Compiling for built-in type traits") + add_definitions(-DETL_USE_TYPE_TRAITS_BUILTINS) +endif() + +if (ETL_USER_DEFINED_TYPE_TRAITS) + message(STATUS "Compiling for user defined type traits") + add_definitions(-DETL_USER_DEFINED_TYPE_TRAITS) +endif() + if(NOT UnitTest++_FOUND) # Add unittest-cpp as an ExternalProject include(cmake/unit-test_external_project.cmake) diff --git a/test/runsanitychecks.sh b/test/runsanitychecks.sh index 42f7adbb..a0de3ff3 100755 --- a/test/runsanitychecks.sh +++ b/test/runsanitychecks.sh @@ -13,45 +13,45 @@ echo "-----------------------------------------------" echo " C++03" echo "-----------------------------------------------" -echo "GCC - STL"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +echo "GCC - STL"; } | tee -a ../log.txt +g++ --version | head --lines=1 | tee -a ../log.txt +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "GCC - No STL"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "GCC - No STL"; } | tee -a ../log.txt +g++ --version | head --lines=1 | tee -a ../log.txt +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "GCC - No STL - Builtins"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "GCC - No STL - Builtins"; } | tee -a ../log.txt +g++ --version | head --lines=1 | tee -a ../log.txt +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "GCC - No STL - User defined traits"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USER_DEFINED_TYPE_TRAITS=ON .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +##{ echo ""; echo "GCC - No STL - User defined traits"; } | tee -a ../log.txt +#g++ --version | head --lines=1 | tee -a ../log.txt +#CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON .. +#cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - STL"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "Clang - STL"; } | tee -a ../log.txt +clang++ --version | head --lines=1 | tee -a ../log.txt +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - No STL"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "Clang - No STL"; } | tee -a ../log.txt +clang++ --version | head --lines=1 | tee -a ../log.txt +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - No STL - Builtins"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "Clang - No STL - Builtins"; } | tee -a ../log.txt +clang++ --version | head --lines=1 | tee -a ../log.txt +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - No STL - User defined traits"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USER_DEFINED_TYPE_TRAITS=ON .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +##{ echo ""; echo "Clang - No STL - User defined traits"; } | tee -a ../log.txt +#clang++ --version | head --lines=1 | tee -a ../log.txt +#CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON .. +#cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt ############################################################################### cd ../c++11 || exit 1 @@ -61,45 +61,45 @@ echo "-----------------------------------------------" echo " C++11" echo "-----------------------------------------------" -echo "GCC - STL"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +echo "GCC - STL"; } | tee -a ../log.txt +g++ --version | head --lines=1 | tee -a ../log.txt +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "GCC - No STL"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "GCC - No STL"; } | tee -a ../log.txt +g++ --version | head --lines=1 | tee -a ../log.txt +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "GCC - No STL - Builtins"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "GCC - No STL - Builtins"; } | tee -a ../log.txt +g++ --version | head --lines=1 | tee -a ../log.txt +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "GCC - No STL - User defined traits"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USER_DEFINED_TYPE_TRAITS=ON .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +##{ echo ""; echo "GCC - No STL - User defined traits"; } | tee -a ../log.txt +#g++ --version | head --lines=1 | tee -a ../log.txt +#CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON .. +#cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - STL"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "Clang - STL"; } | tee -a ../log.txt +clang++ --version | head --lines=1 | tee -a ../log.txt +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - No STL"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "Clang - No STL"; } | tee -a ../log.txt +clang++ --version | head --lines=1 | tee -a ../log.txt +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - No STL - Builtins"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "Clang - No STL - Builtins"; } | tee -a ../log.txt +clang++ --version | head --lines=1 | tee -a ../log.txt +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - No STL - User defined traits"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USER_DEFINED_TYPE_TRAITS=ON .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +##{ echo ""; echo "Clang - No STL - User defined traits"; } | tee -a ../log.txt +#clang++ --version | head --lines=1 | tee -a ../log.txt +#CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON .. +#cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt ############################################################################### cd ../c++14 || exit 1 @@ -109,45 +109,45 @@ echo "-----------------------------------------------" echo " C++14" echo "-----------------------------------------------" -echo "GCC - STL"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +echo "GCC - STL"; } | tee -a ../log.txt +g++ --version | head --lines=1 | tee -a ../log.txt +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "GCC - No STL"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "GCC - No STL"; } | tee -a ../log.txt +g++ --version | head --lines=1 | tee -a ../log.txt +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "GCC - No STL - Builtins"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "GCC - No STL - Builtins"; } | tee -a ../log.txt +g++ --version | head --lines=1 | tee -a ../log.txt +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "GCC - No STL - User defined traits"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USER_DEFINED_TYPE_TRAITS=ON .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +##{ echo ""; echo "GCC - No STL - User defined traits"; } | tee -a ../log.txt +#g++ --version | head --lines=1 | tee -a ../log.txt +#CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON .. +#cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - STL"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "Clang - STL"; } | tee -a ../log.txt +clang++ --version | head --lines=1 | tee -a ../log.txt +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - No STL"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "Clang - No STL"; } | tee -a ../log.txt +clang++ --version | head --lines=1 | tee -a ../log.txt +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - No STL - Builtins"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "Clang - No STL - Builtins"; } | tee -a ../log.txt +clang++ --version | head --lines=1 | tee -a ../log.txt +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - No STL - User defined traits"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USER_DEFINED_TYPE_TRAITS=ON .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +##{ echo ""; echo "Clang - No STL - User defined traits"; } | tee -a ../log.txt +#clang++ --version | head --lines=1 | tee -a ../log.txt +#CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON .. +#cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt ############################################################################### cd ../c++17 || exit 1 @@ -157,47 +157,47 @@ echo "-----------------------------------------------" echo " C++17 " echo "-----------------------------------------------" -echo "GCC - STL"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +echo "GCC - STL"; } | tee -a ../log.txt +g++ --version | head --lines=1 | tee -a ../log.txt +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "GCC - No STL"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "GCC - No STL"; } | tee -a ../log.txt +g++ --version | head --lines=1 | tee -a ../log.txt +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "GCC - No STL - Builtins"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "GCC - No STL - Builtins"; } | tee -a ../log.txt +g++ --version | head --lines=1 | tee -a ../log.txt +CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "GCC - No STL - User defined traits"; } >> ../log.txt -g++ --version | head --lines=1 >> ../log.txt -CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USER_DEFINED_TYPE_TRAITS=ON .. -cmake --build bgcc || echo "****************\n**** Failed ****\n****************" >> ../log.txt +##{ echo ""; echo "GCC - No STL - User defined traits"; } | tee -a ../log.txt +#g++ --version | head --lines=1 | tee -a ../log.txt +#CC=gcc CXX=g++ cmake -E chdir bgcc cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON .. +#cmake --build bgcc || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - STL"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "Clang - STL"; } | tee -a ../log.txt +clang++ --version | head --lines=1 | tee -a ../log.txt +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - No STL"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "Clang - No STL"; } | tee -a ../log.txt +clang++ --version | head --lines=1 | tee -a ../log.txt +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - No STL - Builtins"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +{ echo ""; echo "Clang - No STL - Builtins"; } | tee -a ../log.txt +clang++ --version | head --lines=1 | tee -a ../log.txt +CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt -{ echo ""; echo "Clang - No STL - User defined traits"; } >> ../log.txt -clang++ --version | head --lines=1 >> ../log.txt -CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USER_DEFINED_TYPE_TRAITS=ON .. -cmake --build bclang || echo "****************\n**** Failed ****\n****************" >> ../log.txt +##{ echo ""; echo "Clang - No STL - User defined traits"; } | tee -a ../log.txt +#clang++ --version | head --lines=1 | tee -a ../log.txt +#CC=clang CXX=clang++ cmake -E chdir bclang cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=ON .. +#cmake --build bclang || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt { echo "" echo "-----------------------------------------------" echo " Completed" -echo "-----------------------------------------------"; } >> ../log.txt +echo "-----------------------------------------------"; } | tee -a ../log.txt diff --git a/test/runtests.sh b/test/runtests.sh index 51feeff5..9bbb9c4f 100755 --- a/test/runtests.sh +++ b/test/runtests.sh @@ -4,54 +4,54 @@ cd build || exit 1 echo "ETL Tests" > log.txt echo "" -echo "-----------------------------------------------" >> log.txt -echo " GCC" >> log.txt -echo "-----------------------------------------------" >> log.txt -gcc --version | grep gcc >> log.txt -CC=gcc CXX=g++ cmake --cmake-clean-cache -DNO_STL=OFF .. -make -j8 || echo "****************\n**** Failed ****\n****************" >> ../log.txt +echo "-----------------------------------------------" | tee -a log.txt +echo " GCC" | tee -a log.txt +echo "-----------------------------------------------" | tee -a log.txt +gcc --version | grep gcc | tee -a log.txt +CC=gcc CXX=g++ cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +make -j8 || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt ./etl_tests | tee log.txt echo "" -echo "-----------------------------------------------" >> log.txt -echo " GCC - No STL" >> log.txt -echo "-----------------------------------------------" >> log.txt -gcc --version | grep gcc >> log.txt -CC=gcc CXX=g++ cmake --cmake-clean-cache -DNO_STL=ON .. -make -j8 || echo "****************\n**** Failed ****\n****************" >> ../log.txt +echo "-----------------------------------------------" | tee -a log.txt +echo " GCC - No STL" | tee -a log.txt +echo "-----------------------------------------------" | tee -a log.txt +gcc --version | grep gcc | tee -a log.txt +CC=gcc CXX=g++ cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +make -j8 || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt ./etl_tests | tee log.txt echo "" -echo "-----------------------------------------------" >> log.txt -echo " GCC - No STL - Builtins" >> log.txt -echo "-----------------------------------------------" >> log.txt -gcc --version | grep gcc >> log.txt -CC=gcc CXX=g++ cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON .. -make -j8 || echo "****************\n**** Failed ****\n****************" >> ../log.txt +echo "-----------------------------------------------" | tee -a log.txt +echo " GCC - No STL - Builtins" | tee -a log.txt +echo "-----------------------------------------------" | tee -a log.txt +gcc --version | grep gcc | tee -a log.txt +CC=gcc CXX=g++ cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +make -j8 || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt ./etl_tests | tee log.txt echo "" -echo "-----------------------------------------------" >> log.txt -echo " Clang" >> log.txt -echo "-----------------------------------------------" >> log.txt -clang --version | grep clang >> log.txt -CC=clang CXX=clang++ cmake --cmake-clean-cache -DNO_STL=OFF .. -make -j8 || echo "****************\n**** Failed ****\n****************" >> ../log.txt +echo "-----------------------------------------------" | tee -a log.txt +echo " Clang" | tee -a log.txt +echo "-----------------------------------------------" | tee -a log.txt +clang --version | grep clang | tee -a log.txt +CC=clang CXX=clang++ cmake --cmake-clean-cache -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +make -j8 || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt ./etl_tests | tee log.txt echo "" -echo "-----------------------------------------------" >> log.txt -echo " Clang - No STL" >> log.txt -echo "-----------------------------------------------" >> log.txt -clang --version | grep clang >> log.txt -CC=clang CXX=clang++ cmake --cmake-clean-cache -DNO_STL=ON .. -make -j8 || echo "****************\n**** Failed ****\n****************" >> ../log.txt +echo "-----------------------------------------------" | tee -a log.txt +echo " Clang - No STL" | tee -a log.txt +echo "-----------------------------------------------" | tee -a log.txt +clang --version | grep clang | tee -a log.txt +CC=clang CXX=clang++ cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +make -j8 || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt ./etl_tests | tee log.txt echo "" -echo "-----------------------------------------------" >> log.txt -echo " Clang - No STL - Builtins" >> log.txt -echo "-----------------------------------------------" >> log.txt -clang --version | grep clang >> log.txt -CC=clang CXX=clang++ cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON .. -make -j8 || echo "****************\n**** Failed ****\n****************" >> ../log.txt +echo "-----------------------------------------------" | tee -a log.txt +echo " Clang - No STL - Builtins" | tee -a log.txt +echo "-----------------------------------------------" | tee -a log.txt +clang --version | grep clang | tee -a log.txt +CC=clang CXX=clang++ cmake --cmake-clean-cache -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=ON -DETL_USER_DEFINED_TYPE_TRAITS=OFF .. +make -j8 || echo "****************\n**** Failed ****\n****************" | tee -a ../log.txt ./etl_tests | tee log.txt echo "" -echo "-----------------------------------------------" >> log.txt -echo " Tests Completed" >> log.txt -echo "-----------------------------------------------" >> log.txt +echo "-----------------------------------------------" | tee -a log.txt +echo " Tests Completed" | tee -a log.txt +echo "-----------------------------------------------" | tee -a log.txt diff --git a/test/sanity-check/c++03/CMakeLists.txt b/test/sanity-check/c++03/CMakeLists.txt index ff78e74f..eaea3524 100644 --- a/test/sanity-check/c++03/CMakeLists.txt +++ b/test/sanity-check/c++03/CMakeLists.txt @@ -12,6 +12,16 @@ else() message(STATUS "Compiling for STL") endif() +if (ETL_USE_TYPE_TRAITS_BUILTINS) + message(STATUS "Compiling for built-in type traits") + add_definitions(-DETL_USE_TYPE_TRAITS_BUILTINS) +endif() + +if (ETL_USER_DEFINED_TYPE_TRAITS) + message(STATUS "Compiling for user defined type traits") + add_definitions(-DETL_USER_DEFINED_TYPE_TRAITS) +endif() + add_library(t98 OBJECT) target_compile_definitions(t98 PRIVATE __STDC_LIMIT_MACROS __STDC_CONSTANT_MACROS __STDC_FORMAT_MACROS) target_include_directories(t98 PRIVATE "") diff --git a/test/sanity-check/c++11/CMakeLists.txt b/test/sanity-check/c++11/CMakeLists.txt index aa401782..c9c2d2a3 100644 --- a/test/sanity-check/c++11/CMakeLists.txt +++ b/test/sanity-check/c++11/CMakeLists.txt @@ -12,6 +12,16 @@ else() message(STATUS "Compiling for STL") endif() +if (ETL_USE_TYPE_TRAITS_BUILTINS) + message(STATUS "Compiling for built-in type traits") + add_definitions(-DETL_USE_TYPE_TRAITS_BUILTINS) +endif() + +if (ETL_USER_DEFINED_TYPE_TRAITS) + message(STATUS "Compiling for user defined type traits") + add_definitions(-DETL_USER_DEFINED_TYPE_TRAITS) +endif() + add_library(t11 OBJECT) target_compile_definitions(t11 PRIVATE __STDC_LIMIT_MACROS __STDC_CONSTANT_MACROS __STDC_FORMAT_MACROS) target_include_directories(t11 PRIVATE "") diff --git a/test/sanity-check/c++14/CMakeLists.txt b/test/sanity-check/c++14/CMakeLists.txt index 40996189..4b3a512b 100644 --- a/test/sanity-check/c++14/CMakeLists.txt +++ b/test/sanity-check/c++14/CMakeLists.txt @@ -12,6 +12,16 @@ else() message(STATUS "Compiling for STL") endif() +if (ETL_USE_TYPE_TRAITS_BUILTINS) + message(STATUS "Compiling for built-in type traits") + add_definitions(-DETL_USE_TYPE_TRAITS_BUILTINS) +endif() + +if (ETL_USER_DEFINED_TYPE_TRAITS) + message(STATUS "Compiling for user defined type traits") + add_definitions(-DETL_USER_DEFINED_TYPE_TRAITS) +endif() + add_library(t14 OBJECT) target_compile_definitions(t14 PRIVATE __STDC_LIMIT_MACROS __STDC_CONSTANT_MACROS __STDC_FORMAT_MACROS) target_include_directories(t14 PRIVATE "") diff --git a/test/sanity-check/c++17/CMakeLists.txt b/test/sanity-check/c++17/CMakeLists.txt index 81cdbb4a..4b1b89c8 100644 --- a/test/sanity-check/c++17/CMakeLists.txt +++ b/test/sanity-check/c++17/CMakeLists.txt @@ -12,6 +12,16 @@ else() message(STATUS "Compiling for STL") endif() +if (ETL_USE_TYPE_TRAITS_BUILTINS) + message(STATUS "Compiling for built-in type traits") + add_definitions(-DETL_USE_TYPE_TRAITS_BUILTINS) +endif() + +if (ETL_USER_DEFINED_TYPE_TRAITS) + message(STATUS "Compiling for user defined type traits") + add_definitions(-DETL_USER_DEFINED_TYPE_TRAITS) +endif() + add_library(t17 OBJECT) target_compile_definitions(t17 PRIVATE __STDC_LIMIT_MACROS __STDC_CONSTANT_MACROS __STDC_FORMAT_MACROS) target_include_directories(t17 PRIVATE "") diff --git a/test/test_type_traits.cpp b/test/test_type_traits.cpp index b3f8b938..234acce5 100644 --- a/test/test_type_traits.cpp +++ b/test/test_type_traits.cpp @@ -1068,20 +1068,24 @@ namespace //************************************************************************* TEST(test_is_trivially_copy_assignable) { +#if (!(defined(ETL_COMPILER_GCC) && defined(ETL_USE_TYPE_TRAITS_BUILTINS))) #if ETL_USING_STL || defined(ETL_USE_TYPE_TRAITS_BUILTINS) || defined(ETL_USER_DEFINED_TYPE_TRAITS) CHECK((etl::is_trivially_copy_assignable_v) == (std::is_trivially_copy_assignable_v)); CHECK((etl::is_trivially_copy_assignable_v) == (std::is_trivially_copy_assignable_v)); CHECK((etl::is_trivially_copy_assignable_v) == (std::is_trivially_copy_assignable_v)); +#endif #endif } //************************************************************************* TEST(test_is_trivially_copyable) { +#if (!(defined(ETL_COMPILER_GCC) && defined(ETL_USE_TYPE_TRAITS_BUILTINS))) #if ETL_USING_STL || defined(ETL_USE_TYPE_TRAITS_BUILTINS) || defined(ETL_USER_DEFINED_TYPE_TRAITS) CHECK((etl::is_trivially_copyable_v) == (std::is_trivially_copyable_v)); CHECK((etl::is_trivially_copyable_v) == (std::is_trivially_copyable_v)); CHECK((etl::is_trivially_copyable_v) == (std::is_trivially_copyable_v)); +#endif #endif } } diff --git a/test/test_vector_non_trivial.cpp b/test/test_vector_non_trivial.cpp index d7723df0..39a71c04 100644 --- a/test/test_vector_non_trivial.cpp +++ b/test/test_vector_non_trivial.cpp @@ -730,6 +730,7 @@ namespace CHECK_EQUAL(1, data[3]); } +#if (!(defined(ETL_COMPILER_GCC) && defined(ETL_USE_TYPE_TRAITS_BUILTINS))) //************************************************************************* TEST_FIXTURE(SetupFixture, test_insert_unique_ptr) { @@ -754,8 +755,8 @@ namespace CHECK_EQUAL(4, *data[0]); CHECK_EQUAL(3, *data[1]); CHECK_EQUAL(2, *data[2]); - } +#endif //************************************************************************* // To test the CPP03 versions then ETL_TEST_VECTOR_CPP11 must be set to 0 in vector.h diff --git a/test/vs2019/etl.sln b/test/vs2019/etl.sln index 7e198816..de7c4e23 100644 --- a/test/vs2019/etl.sln +++ b/test/vs2019/etl.sln @@ -7,12 +7,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "etl", "etl.vcxproj", "{C21D EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug LLVM - No STL - Built-ins|Win32 = Debug LLVM - No STL - Built-ins|Win32 + Debug LLVM - No STL - Built-ins|x64 = Debug LLVM - No STL - Built-ins|x64 Debug LLVM - No STL|Win32 = Debug LLVM - No STL|Win32 Debug LLVM - No STL|x64 = Debug LLVM - No STL|x64 Debug LLVM|Win32 = Debug LLVM|Win32 Debug LLVM|x64 = Debug LLVM|x64 - Debug MSVC - No STL - Builtins|Win32 = Debug MSVC - No STL - Builtins|Win32 - Debug MSVC - No STL - Builtins|x64 = Debug MSVC - No STL - Builtins|x64 + Debug MSVC - No STL - Built-ins|Win32 = Debug MSVC - No STL - Built-ins|Win32 + Debug MSVC - No STL - Built-ins|x64 = Debug MSVC - No STL - Built-ins|x64 Debug MSVC - No STL - Force No Advanced|Win32 = Debug MSVC - No STL - Force No Advanced|Win32 Debug MSVC - No STL - Force No Advanced|x64 = Debug MSVC - No STL - Force No Advanced|x64 Debug MSVC - No STL|Win32 = Debug MSVC - No STL|Win32 @@ -29,8 +31,6 @@ Global Debug MSVC No Checks|x64 = Debug MSVC No Checks|x64 Debug MSVC|Win32 = Debug MSVC|Win32 Debug MSVC|x64 = Debug MSVC|x64 - Debug LLVM - No STL - Builtins|Win32 = Debug LLVM - No STL - Builtins|Win32 - Debug LLVM - No STL - Builtins|x64 = Debug LLVM - No STL - Builtins|x64 LLVM New|Win32 = LLVM New|Win32 LLVM New|x64 = LLVM New|x64 MSVCDebugAppveyor|Win32 = MSVCDebugAppveyor|Win32 @@ -41,6 +41,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug LLVM - No STL - Built-ins|Win32.ActiveCfg = Test2|Win32 + {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug LLVM - No STL - Built-ins|Win32.Build.0 = Test2|Win32 + {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug LLVM - No STL - Built-ins|x64.ActiveCfg = Test2|x64 + {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug LLVM - No STL - Built-ins|x64.Build.0 = Test2|x64 {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug LLVM - No STL|Win32.ActiveCfg = DebugLLVMNoSTL|Win32 {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug LLVM - No STL|Win32.Build.0 = DebugLLVMNoSTL|Win32 {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug LLVM - No STL|x64.ActiveCfg = DebugLLVMNoSTL|x64 @@ -49,10 +53,10 @@ Global {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug LLVM|Win32.Build.0 = Debug LLVM|Win32 {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug LLVM|x64.ActiveCfg = Debug LLVM|x64 {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug LLVM|x64.Build.0 = Debug LLVM|x64 - {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC - No STL - Builtins|Win32.ActiveCfg = Debug|Win32 - {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC - No STL - Builtins|Win32.Build.0 = Debug|Win32 - {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC - No STL - Builtins|x64.ActiveCfg = Debug-MSVC-No-STL-Builtins|x64 - {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC - No STL - Builtins|x64.Build.0 = Debug-MSVC-No-STL-Builtins|x64 + {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC - No STL - Built-ins|Win32.ActiveCfg = Test1|Win32 + {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC - No STL - Built-ins|Win32.Build.0 = Test1|Win32 + {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC - No STL - Built-ins|x64.ActiveCfg = Test1|x64 + {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC - No STL - Built-ins|x64.Build.0 = Test1|x64 {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC - No STL - Force No Advanced|Win32.ActiveCfg = DebugNoSTLForceNoAdvanced|Win32 {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC - No STL - Force No Advanced|Win32.Build.0 = DebugNoSTLForceNoAdvanced|Win32 {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC - No STL - Force No Advanced|x64.ActiveCfg = DebugNoSTLForceNoAdvanced|x64 @@ -85,10 +89,6 @@ Global {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC|Win32.Build.0 = Debug|Win32 {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC|x64.ActiveCfg = Debug|x64 {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC|x64.Build.0 = Debug|x64 - {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug LLVM - No STL - Builtins|Win32.ActiveCfg = Debug-LLVM-NoSTL-Builtins|Win32 - {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug LLVM - No STL - Builtins|Win32.Build.0 = Debug-LLVM-NoSTL-Builtins|Win32 - {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug LLVM - No STL - Builtins|x64.ActiveCfg = Debug-LLVM-NoSTL-Builtins|x64 - {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug LLVM - No STL - Builtins|x64.Build.0 = Debug-LLVM-NoSTL-Builtins|x64 {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.LLVM New|Win32.ActiveCfg = LLVM New|Win32 {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.LLVM New|Win32.Build.0 = LLVM New|Win32 {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.LLVM New|x64.ActiveCfg = LLVM New|x64 diff --git a/test/vs2019/etl.vcxproj b/test/vs2019/etl.vcxproj index c010d82a..62ce00da 100644 --- a/test/vs2019/etl.vcxproj +++ b/test/vs2019/etl.vcxproj @@ -145,6 +145,22 @@ Release x64 + + Test1 + Win32 + + + Test1 + x64 + + + Test2 + Win32 + + + Test2 + x64 + {C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB} @@ -198,6 +214,13 @@ Unicode false + + Application + true + v142 + Unicode + false + Application true @@ -229,6 +252,12 @@ ClangCL Unicode + + Application + true + ClangCL + Unicode + Application true @@ -289,6 +318,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application true @@ -319,6 +354,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application true @@ -399,6 +440,9 @@ + + + @@ -414,6 +458,9 @@ + + + @@ -444,6 +491,9 @@ + + + @@ -459,6 +509,9 @@ + + + @@ -522,6 +575,11 @@ true \$(IntDir) + + true + true + \$(IntDir) + true true @@ -547,6 +605,11 @@ true \$(IntDir) + + false + true + \$(IntDir) + false true @@ -590,6 +653,10 @@ true true + + true + true + true true @@ -610,6 +677,10 @@ true true + + true + true + true true @@ -796,6 +867,28 @@ $(OutDir)\etl.exe + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING;ETL_NO_STL;ETL_USE_TYPE_TRAITS_BUILTINS;%(PreprocessorDefinitions) + ./;../../../unittest-cpp/;../../include;../../test + + + true + stdcpp17 + ProgramDatabase + + + Console + true + + + $(OutDir)\etl.exe + + @@ -908,6 +1001,30 @@ "$(OutDir)etl.exe" + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;ETL_NO_STL;ETL_USE_TYPE_TRAITS_BUILTINS;__clang__;%(PreprocessorDefinitions) + ../../../unittest-cpp/;../../include;../../test + + + false + stdcpp17 + false + ProgramDatabase + -Wno-self-assign /Zc:__cplusplus %(AdditionalOptions) + + + Console + false + + + "$(OutDir)etl.exe" + + @@ -1151,6 +1268,27 @@ $(OutDir)\etl.exe + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ../../unittest-cpp/UnitTest++/;../../include/etl;../../test + + + false + stdcpp14 + + + Console + true + + + $(OutDir)\etl.exe + + @@ -1256,6 +1394,27 @@ $(OutDir)\etl.exe + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ../../unittest-cpp/UnitTest++/;../../include/etl;../../test + + + false + stdcpp14 + + + Console + true + + + $(OutDir)\etl.exe + + @@ -1818,10 +1977,12 @@ true true true + true true true true true + true true true true @@ -1838,10 +1999,12 @@ true true true + true true true true true + true true true true @@ -1858,10 +2021,12 @@ true true true + true true true true true + true true true true @@ -1878,10 +2043,12 @@ true true true + true true true true true + true true true true @@ -1898,10 +2065,12 @@ true true true + true true true true true + true true true true @@ -1918,10 +2087,12 @@ true true true + true true true true true + true true true true @@ -1938,10 +2109,12 @@ true true true + true true true true true + true true true true @@ -1958,10 +2131,12 @@ true true true + true true true true true + true true true true @@ -1978,10 +2153,12 @@ true true true + true true true true true + true true true true @@ -1998,10 +2175,12 @@ true true true + true true true true true + true true true true @@ -2018,10 +2197,12 @@ true true true + true true true true true + true true true true @@ -2032,6 +2213,7 @@ true true + true true true true @@ -2041,6 +2223,7 @@ true true true + true true true true @@ -2055,10 +2238,12 @@ true true true + true true true true true + true true true true @@ -2075,10 +2260,12 @@ true true true + true true true true true + true true true true @@ -2095,10 +2282,12 @@ true true true + true true true true true + true true true true @@ -2115,10 +2304,12 @@ true true true + true true true true true + true true true true @@ -2135,10 +2326,12 @@ true true true + true true true true true + true true true true @@ -2155,10 +2348,12 @@ true true true + true true true true true + true true true true @@ -2175,10 +2370,12 @@ true true true + true true true true true + true true true true @@ -2195,10 +2392,12 @@ true true true + true true true true true + true true true true @@ -2215,10 +2414,12 @@ true true true + true true true true true + true true true true @@ -2235,10 +2436,12 @@ true true true + true true true true true + true true true true @@ -2255,10 +2458,12 @@ true true true + true true true true true + true true true true @@ -2275,10 +2480,12 @@ true true true + true true true true true + true true true true @@ -2295,10 +2502,12 @@ true true true + true true true true true + true true true true @@ -2315,10 +2524,12 @@ true true true + true true true true true + true true true true @@ -2335,10 +2546,12 @@ true true true + true true true true true + true true true true @@ -2355,10 +2568,12 @@ true true true + true true true true true + true true true true @@ -2375,10 +2590,12 @@ true true true + true true true true true + true true true true @@ -2395,10 +2612,12 @@ true true true + true true true true true + true true true true @@ -2415,10 +2634,12 @@ true true true + true true true true true + true true true true @@ -2435,10 +2656,12 @@ true true true + true true true true true + true true true true @@ -2455,10 +2678,12 @@ true true true + true true true true true + true true true true @@ -2475,10 +2700,12 @@ true true true + true true true true true + true true true true @@ -2495,10 +2722,12 @@ true true true + true true true true true + true true true true @@ -2515,10 +2744,12 @@ true true true + true true true true true + true true true true @@ -2535,10 +2766,12 @@ true true true + true true true true true + true true true true @@ -2555,10 +2788,12 @@ true true true + true true true true true + true true true true @@ -2575,10 +2810,12 @@ true true true + true true true true true + true true true true @@ -2595,10 +2832,12 @@ true true true + true true true true true + true true true true @@ -2615,10 +2854,12 @@ true true true + true true true true true + true true true true @@ -2635,10 +2876,12 @@ true true true + true true true true true + true true true true @@ -2655,10 +2898,12 @@ true true true + true true true true true + true true true true @@ -2675,10 +2920,12 @@ true true true + true true true true true + true true true true @@ -2695,10 +2942,12 @@ true true true + true true true true true + true true true true @@ -2715,10 +2964,12 @@ true true true + true true true true true + true true true true @@ -2735,10 +2986,12 @@ true true true + true true true true true + true true true true @@ -2755,10 +3008,12 @@ true true true + true true true true true + true true true true @@ -2775,10 +3030,12 @@ true true true + true true true true true + true true true true @@ -2795,10 +3052,12 @@ true true true + true true true true true + true true true true @@ -2815,10 +3074,12 @@ true true true + true true true true true + true true true true @@ -2835,10 +3096,12 @@ true true true + true true true true true + true true true true @@ -2855,10 +3118,12 @@ true true true + true true true true true + true true true true @@ -2875,10 +3140,12 @@ true true true + true true true true true + true true true true @@ -2895,10 +3162,12 @@ true true true + true true true true true + true true true true @@ -2915,10 +3184,12 @@ true true true + true true true true true + true true true true @@ -2935,10 +3206,12 @@ true true true + true true true true true + true true true true @@ -2955,10 +3228,12 @@ true true true + true true true true true + true true true true @@ -2975,10 +3250,12 @@ true true true + true true true true true + true true true true @@ -2995,10 +3272,12 @@ true true true + true true true true true + true true true true @@ -3015,10 +3294,12 @@ true true true + true true true true true + true true true true @@ -3035,10 +3316,12 @@ true true true + true true true true true + true true true true @@ -3055,10 +3338,12 @@ true true true + true true true true true + true true true true @@ -3075,10 +3360,12 @@ true true true + true true true true true + true true true true @@ -3095,10 +3382,12 @@ true true true + true true true true true + true true true true @@ -3115,10 +3404,12 @@ true true true + true true true true true + true true true true @@ -3135,10 +3426,12 @@ true true true + true true true true true + true true true true @@ -3155,10 +3448,12 @@ true true true + true true true true true + true true true true @@ -3175,10 +3470,12 @@ true true true + true true true true true + true true true true @@ -3195,10 +3492,12 @@ true true true + true true true true true + true true true true @@ -3215,10 +3514,12 @@ true true true + true true true true true + true true true true @@ -3235,10 +3536,12 @@ true true true + true true true true true + true true true true @@ -3255,10 +3558,12 @@ true true true + true true true true true + true true true true @@ -3275,10 +3580,12 @@ true true true + true true true true true + true true true true @@ -3295,10 +3602,12 @@ true true true + true true true true true + true true true true @@ -3315,10 +3624,12 @@ true true true + true true true true true + true true true true @@ -3335,10 +3646,12 @@ true true true + true true true true true + true true true true @@ -3355,10 +3668,12 @@ true true true + true true true true true + true true true true @@ -3375,10 +3690,12 @@ true true true + true true true true true + true true true true @@ -3395,10 +3712,12 @@ true true true + true true true true true + true true true true @@ -3415,10 +3734,12 @@ true true true + true true true true true + true true true true @@ -3435,10 +3756,12 @@ true true true + true true true true true + true true true true @@ -3455,10 +3778,12 @@ true true true + true true true true true + true true true true @@ -3475,10 +3800,12 @@ true true true + true true true true true + true true true true @@ -3495,10 +3822,12 @@ true true true + true true true true true + true true true true @@ -3515,10 +3844,12 @@ true true true + true true true true true + true true true true @@ -3535,10 +3866,12 @@ true true true + true true true true true + true true true true @@ -3555,10 +3888,12 @@ true true true + true true true true true + true true true true @@ -3575,10 +3910,12 @@ true true true + true true true true true + true true true true @@ -3595,10 +3932,12 @@ true true true + true true true true true + true true true true @@ -3615,10 +3954,12 @@ true true true + true true true true true + true true true true @@ -3635,10 +3976,12 @@ true true true + true true true true true + true true true true @@ -3655,10 +3998,12 @@ true true true + true true true true true + true true true true @@ -3675,10 +4020,12 @@ true true true + true true true true true + true true true true @@ -3695,10 +4042,12 @@ true true true + true true true true true + true true true true @@ -3715,10 +4064,12 @@ true true true + true true true true true + true true true true @@ -3735,10 +4086,12 @@ true true true + true true true true true + true true true true @@ -3755,10 +4108,12 @@ true true true + true true true true true + true true true true @@ -3775,10 +4130,12 @@ true true true + true true true true true + true true true true @@ -3795,10 +4152,12 @@ true true true + true true true true true + true true true true @@ -3815,10 +4174,12 @@ true true true + true true true true true + true true true true @@ -3835,10 +4196,12 @@ true true true + true true true true true + true true true true @@ -3855,10 +4218,12 @@ true true true + true true true true true + true true true true @@ -3875,10 +4240,12 @@ true true true + true true true true true + true true true true @@ -3895,10 +4262,12 @@ true true true + true true true true true + true true true true @@ -3915,10 +4284,12 @@ true true true + true true true true true + true true true true @@ -3935,10 +4306,12 @@ true true true + true true true true true + true true true true @@ -3955,10 +4328,12 @@ true true true + true true true true true + true true true true @@ -3975,10 +4350,12 @@ true true true + true true true true true + true true true true @@ -3995,10 +4372,12 @@ true true true + true true true true true + true true true true @@ -4015,10 +4394,12 @@ true true true + true true true true true + true true true true @@ -4035,10 +4416,12 @@ true true true + true true true true true + true true true true @@ -4055,10 +4438,12 @@ true true true + true true true true true + true true true true @@ -4075,10 +4460,12 @@ true true true + true true true true true + true true true true @@ -4095,10 +4482,12 @@ true true true + true true true true true + true true true true @@ -4115,10 +4504,12 @@ true true true + true true true true true + true true true true @@ -4135,10 +4526,12 @@ true true true + true true true true true + true true true true @@ -4155,10 +4548,12 @@ true true true + true true true true true + true true true true @@ -4175,10 +4570,12 @@ true true true + true true true true true + true true true true @@ -4195,10 +4592,12 @@ true true true + true true true true true + true true true true @@ -4215,10 +4614,12 @@ true true true + true true true true true + true true true true @@ -4235,10 +4636,12 @@ true true true + true true true true true + true true true true @@ -4255,10 +4658,12 @@ true true true + true true true true true + true true true true @@ -4275,10 +4680,12 @@ true true true + true true true true true + true true true true @@ -4295,10 +4702,12 @@ true true true + true true true true true + true true true true @@ -4315,10 +4724,12 @@ true true true + true true true true true + true true true true @@ -4335,10 +4746,12 @@ true true true + true true true true true + true true true true @@ -4355,10 +4768,12 @@ true true true + true true true true true + true true true true @@ -4375,10 +4790,12 @@ true true true + true true true true true + true true true true @@ -4395,10 +4812,12 @@ true true true + true true true true true + true true true true @@ -4415,10 +4834,12 @@ true true true + true true true true true + true true true true @@ -4435,10 +4856,12 @@ true true true + true true true true true + true true true true @@ -4455,10 +4878,12 @@ true true true + true true true true true + true true true true @@ -4475,10 +4900,12 @@ true true true + true true true true true + true true true true @@ -4495,10 +4922,12 @@ true true true + true true true true true + true true true true @@ -4515,10 +4944,12 @@ true true true + true true true true true + true true true true @@ -4535,10 +4966,12 @@ true true true + true true true true true + true true true true @@ -4555,10 +4988,12 @@ true true true + true true true true true + true true true true @@ -4575,10 +5010,12 @@ true true true + true true true true true + true true true true @@ -4595,10 +5032,12 @@ true true true + true true true true true + true true true true @@ -4615,10 +5054,12 @@ true true true + true true true true true + true true true true @@ -4635,10 +5076,12 @@ true true true + true true true true true + true true true true @@ -4655,10 +5098,12 @@ true true true + true true true true true + true true true true @@ -4675,10 +5120,12 @@ true true true + true true true true true + true true true true @@ -4695,10 +5142,12 @@ true true true + true true true true true + true true true true @@ -4715,10 +5164,12 @@ true true true + true true true true true + true true true true @@ -4735,10 +5186,12 @@ true true true + true true true true true + true true true true @@ -4755,10 +5208,12 @@ true true true + true true true true true + true true true true @@ -4775,10 +5230,12 @@ true true true + true true true true true + true true true true @@ -4795,10 +5252,12 @@ true true true + true true true true true + true true true true @@ -4815,10 +5274,12 @@ true true true + true true true true true + true true true true @@ -4835,10 +5296,12 @@ true true true + true true true true true + true true true true @@ -4855,10 +5318,12 @@ true true true + true true true true true + true true true true @@ -4875,10 +5340,12 @@ true true true + true true true true true + true true true true @@ -4895,10 +5362,12 @@ true true true + true true true true true + true true true true @@ -4915,10 +5384,12 @@ true true true + true true true true true + true true true true @@ -4935,10 +5406,12 @@ true true true + true true true true true + true true true true @@ -4955,10 +5428,12 @@ true true true + true true true true true + true true true true @@ -4975,10 +5450,12 @@ true true true + true true true true true + true true true true @@ -4995,10 +5472,12 @@ true true true + true true true true true + true true true true @@ -5015,10 +5494,12 @@ true true true + true true true true true + true true true true @@ -5035,10 +5516,12 @@ true true true + true true true true true + true true true true @@ -5055,10 +5538,12 @@ true true true + true true true true true + true true true true @@ -5075,10 +5560,12 @@ true true true + true true true true true + true true true true @@ -5095,10 +5582,12 @@ true true true + true true true true true + true true true true @@ -5115,10 +5604,12 @@ true true true + true true true true true + true true true true @@ -5135,10 +5626,12 @@ true true true + true true true true true + true true true true @@ -5155,10 +5648,12 @@ true true true + true true true true true + true true true true @@ -5175,10 +5670,12 @@ true true true + true true true true true + true true true true @@ -5195,10 +5692,12 @@ true true true + true true true true true + true true true true @@ -5215,10 +5714,12 @@ true true true + true true true true true + true true true true @@ -5235,10 +5736,12 @@ true true true + true true true true true + true true true true @@ -5255,10 +5758,12 @@ true true true + true true true true true + true true true true @@ -5275,10 +5780,12 @@ true true true + true true true true true + true true true true @@ -5295,10 +5802,12 @@ true true true + true true true true true + true true true true @@ -5315,10 +5824,12 @@ true true true + true true true true true + true true true true @@ -5335,10 +5846,12 @@ true true true + true true true true true + true true true true @@ -5355,10 +5868,12 @@ true true true + true true true true true + true true true true @@ -5375,10 +5890,12 @@ true true true + true true true true true + true true true true @@ -5395,10 +5912,12 @@ true true true + true true true true true + true true true true @@ -5415,10 +5934,12 @@ true true true + true true true true true + true true true true @@ -5435,10 +5956,12 @@ true true true + true true true true true + true true true true @@ -5455,10 +5978,12 @@ true true true + true true true true true + true true true true @@ -5475,10 +6000,12 @@ true true true + true true true true true + true true true true @@ -5495,10 +6022,12 @@ true true true + true true true true true + true true true true @@ -5515,10 +6044,12 @@ true true true + true true true true true + true true true true @@ -5535,10 +6066,12 @@ true true true + true true true true true + true true true true @@ -5555,10 +6088,12 @@ true true true + true true true true true + true true true true @@ -5575,10 +6110,12 @@ true true true + true true true true true + true true true true @@ -5595,10 +6132,12 @@ true true true + true true true true true + true true true true @@ -5615,10 +6154,12 @@ true true true + true true true true true + true true true true @@ -5635,10 +6176,12 @@ true true true + true true true true true + true true true true @@ -5655,10 +6198,12 @@ true true true + true true true true true + true true true true @@ -5675,10 +6220,12 @@ true true true + true true true true true + true true true true @@ -5695,10 +6242,12 @@ true true true + true true true true true + true true true true @@ -5715,10 +6264,12 @@ true true true + true true true true true + true true true true @@ -5735,10 +6286,12 @@ true true true + true true true true true + true true true true @@ -5755,10 +6308,12 @@ true true true + true true true true true + true true true true @@ -5775,10 +6330,12 @@ true true true + true true true true true + true true true true @@ -5795,10 +6352,12 @@ true true true + true true true true true + true true true true @@ -5815,10 +6374,12 @@ true true true + true true true true true + true true true true @@ -5835,10 +6396,12 @@ true true true + true true true true true + true true true true @@ -5855,10 +6418,12 @@ true true true + true true true true true + true true true true @@ -5875,10 +6440,12 @@ true true true + true true true true true + true true true true @@ -5895,10 +6462,12 @@ true true true + true true true true true + true true true true @@ -5915,10 +6484,12 @@ true true true + true true true true true + true true true true @@ -5935,10 +6506,12 @@ true true true + true true true true true + true true true true @@ -5955,10 +6528,12 @@ true true true + true true true true true + true true true true @@ -5975,10 +6550,12 @@ true true true + true true true true true + true true true true @@ -5995,10 +6572,12 @@ true true true + true true true true true + true true true true @@ -6015,10 +6594,12 @@ true true true + true true true true true + true true true true @@ -6035,10 +6616,12 @@ true true true + true true true true true + true true true true @@ -6055,10 +6638,12 @@ true true true + true true true true true + true true true true @@ -6075,10 +6660,12 @@ true true true + true true true true true + true true true true @@ -6095,10 +6682,12 @@ true true true + true true true true true + true true true true @@ -6115,10 +6704,12 @@ true true true + true true true true true + true true true true @@ -6135,10 +6726,12 @@ true true true + true true true true true + true true true true @@ -6155,10 +6748,12 @@ true true true + true true true true true + true true true true @@ -6175,10 +6770,12 @@ true true true + true true true true true + true true true true @@ -6195,10 +6792,12 @@ true true true + true true true true true + true true true true @@ -6215,10 +6814,12 @@ true true true + true true true true true + true true true true @@ -6235,10 +6836,12 @@ true true true + true true true true true + true true true true @@ -6255,10 +6858,12 @@ true true true + true true true true true + true true true true @@ -6275,10 +6880,12 @@ true true true + true true true true true + true true true true @@ -6295,10 +6902,12 @@ true true true + true true true true true + true true true true @@ -6315,10 +6924,12 @@ true true true + true true true true true + true true true true @@ -6335,10 +6946,12 @@ true true true + true true true true true + true true true true @@ -6355,10 +6968,12 @@ true true true + true true true true true + true true true true @@ -6375,10 +6990,12 @@ true true true + true true true true true + true true true true @@ -6395,10 +7012,12 @@ true true true + true true true true true + true true true true @@ -6415,10 +7034,12 @@ true true true + true true true true true + true true true true @@ -6435,10 +7056,12 @@ true true true + true true true true true + true true true true @@ -6455,10 +7078,12 @@ true true true + true true true true true + true true true true @@ -6475,10 +7100,12 @@ true true true + true true true true true + true true true true @@ -6600,11 +7227,13 @@ false false false + false false false false false false + false false false false @@ -6616,11 +7245,13 @@ false false false + false false false false false false + false false false false @@ -6651,11 +7282,13 @@ false false false + false false false false false false + false false false false @@ -6667,11 +7300,13 @@ false false false + false false false false false false + false false false false @@ -6697,11 +7332,13 @@ false false false + false false false false false false + false false false false @@ -6713,11 +7350,13 @@ false false false + false false false false false false + false false false false @@ -6733,11 +7372,13 @@ false false false + false false false false false false + false false false false @@ -6749,11 +7390,13 @@ false false false + false false false false false false + false false false false @@ -6769,11 +7412,13 @@ false false false + false false false false false false + false false false false @@ -6785,11 +7430,13 @@ false false false + false false false false false false + false false false false @@ -6805,11 +7452,13 @@ false false false + false false false false false false + false false false false @@ -6821,11 +7470,13 @@ false false false + false false false false false false + false false false false @@ -6841,11 +7492,13 @@ false false false + false false false false false false + false false false false @@ -6857,11 +7510,13 @@ false false false + false false false false false false + false false false false @@ -6882,11 +7537,13 @@ false false false + false false false false false false + false false false false @@ -6898,11 +7555,13 @@ false false false + false false false false false false + false false false false @@ -6922,11 +7581,13 @@ false false false + false false false false false false + false false false false @@ -6938,11 +7599,13 @@ false false false + false false false false false false + false false false false @@ -6968,11 +7631,13 @@ false false false + false false false false false false + false false false false @@ -6984,11 +7649,13 @@ false false false + false false false false false false + false false false false @@ -7148,4 +7815,4 @@ - + \ No newline at end of file diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters index 3cb7534e..25e87889 100644 --- a/test/vs2019/etl.vcxproj.filters +++ b/test/vs2019/etl.vcxproj.filters @@ -1131,9 +1131,6 @@ ETL\Private - - ETL\Private - ETL\Patterns @@ -1886,9 +1883,6 @@ Source Files - - Source Files - Source Files @@ -3041,4 +3035,4 @@ Resource Files - + \ No newline at end of file