From e122383d7db4596726329cb4cdb00b6312d1a2b4 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 6 Dec 2020 14:13:37 +0000 Subject: [PATCH] Updated for automatic detection of or --- include/etl/callback_timer.h | 3 +- include/etl/deque.h | 6 +-- include/etl/flat_map.h | 3 +- include/etl/flat_multimap.h | 3 +- include/etl/flat_multiset.h | 1 + include/etl/flat_set.h | 3 +- include/etl/forward_list.h | 5 +- .../etl/generators/message_router_generator.h | 2 +- include/etl/list.h | 5 +- include/etl/map.h | 5 +- include/etl/memory.h | 2 +- include/etl/message_router.h | 2 +- include/etl/multimap.h | 5 +- include/etl/multiset.h | 5 +- include/etl/optional.h | 4 +- include/etl/packet.h | 3 +- include/etl/placement_new.h | 48 +++++++++++++++++++ include/etl/platform.h | 13 +++++ include/etl/pool.h | 4 +- include/etl/queue.h | 3 +- include/etl/queue_mpmc_mutex.h | 3 +- include/etl/queue_spsc_atomic.h | 3 +- include/etl/queue_spsc_isr.h | 3 +- include/etl/queue_spsc_locked.h | 3 +- include/etl/set.h | 4 +- include/etl/stack.h | 3 +- include/etl/unordered_map.h | 3 +- include/etl/unordered_multimap.h | 3 +- include/etl/unordered_multiset.h | 5 +- include/etl/unordered_set.h | 3 +- include/etl/variant.h | 3 +- include/etl/vector.h | 3 +- test/runtests.sh | 8 ++-- test/vs2019/etl.vcxproj | 1 + test/vs2019/etl.vcxproj.filters | 3 ++ {include/etl/private => test/vs2019}/new.h | 13 +++-- wslcopy.sh | 1 + 37 files changed, 106 insertions(+), 84 deletions(-) create mode 100644 include/etl/placement_new.h rename {include/etl/private => test/vs2019}/new.h (83%) create mode 100644 wslcopy.sh diff --git a/include/etl/callback_timer.h b/include/etl/callback_timer.h index 389da98a..0e2c43a0 100644 --- a/include/etl/callback_timer.h +++ b/include/etl/callback_timer.h @@ -31,8 +31,6 @@ SOFTWARE. #include -#include "private/new.h" - #include "platform.h" #include "algorithm.h" #include "nullptr.h" @@ -41,6 +39,7 @@ SOFTWARE. #include "timer.h" #include "atomic.h" #include "error_handler.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED #include "delegate.h" diff --git a/include/etl/deque.h b/include/etl/deque.h index d68f84e7..72bf84ef 100644 --- a/include/etl/deque.h +++ b/include/etl/deque.h @@ -34,15 +34,10 @@ SOFTWARE. #include #include -#include "private/new.h" - - #include "platform.h" - #include "algorithm.h" #include "iterator.h" #include "utility.h" - #include "container.h" #include "memory.h" #include "exception.h" @@ -51,6 +46,7 @@ SOFTWARE. #include "algorithm.h" #include "type_traits.h" #include "iterator.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/include/etl/flat_map.h b/include/etl/flat_map.h index 2e69675f..b6168d89 100644 --- a/include/etl/flat_map.h +++ b/include/etl/flat_map.h @@ -31,11 +31,10 @@ SOFTWARE. #ifndef ETL_FLAT_MAP_INCLUDED #define ETL_FLAT_MAP_INCLUDED -#include "private/new.h" - #include "platform.h" #include "reference_flat_map.h" #include "pool.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/include/etl/flat_multimap.h b/include/etl/flat_multimap.h index 0f97f66c..6df8143b 100644 --- a/include/etl/flat_multimap.h +++ b/include/etl/flat_multimap.h @@ -31,12 +31,11 @@ SOFTWARE. #ifndef ETL_FLAT_MULTMAP_INCLUDED #define ETL_FLAT_MULTMAP_INCLUDED -#include "private/new.h" - #include "platform.h" #include "reference_flat_multimap.h" #include "pool.h" #include "utility.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/include/etl/flat_multiset.h b/include/etl/flat_multiset.h index 2e3ce7ae..496cf843 100644 --- a/include/etl/flat_multiset.h +++ b/include/etl/flat_multiset.h @@ -34,6 +34,7 @@ SOFTWARE. #include "platform.h" #include "reference_flat_multiset.h" #include "pool.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/include/etl/flat_set.h b/include/etl/flat_set.h index baa26301..c4d5c7c9 100644 --- a/include/etl/flat_set.h +++ b/include/etl/flat_set.h @@ -31,11 +31,10 @@ SOFTWARE. #ifndef ETL_FLAT_SET_INCLUDED #define ETL_FLAT_SET_INCLUDED -#include "private/new.h" - #include "platform.h" #include "reference_flat_set.h" #include "pool.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/include/etl/forward_list.h b/include/etl/forward_list.h index d5754ab3..a870aba6 100644 --- a/include/etl/forward_list.h +++ b/include/etl/forward_list.h @@ -33,15 +33,11 @@ SOFTWARE. #include -#include "private/new.h" - #include "platform.h" - #include "algorithm.h" #include "iterator.h" #include "functional.h" #include "utility.h" - #include "pool.h" #include "container.h" #include "exception.h" @@ -52,6 +48,7 @@ SOFTWARE. #include "memory.h" #include "iterator.h" #include "static_assert.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/include/etl/generators/message_router_generator.h b/include/etl/generators/message_router_generator.h index 93d68119..aa4b208b 100644 --- a/include/etl/generators/message_router_generator.h +++ b/include/etl/generators/message_router_generator.h @@ -64,7 +64,6 @@ cog.outl("//******************************************************************** #define ETL_MESSAGE_ROUTER_INCLUDED #include -#include "private/new.h" #include "platform.h" #include "message.h" @@ -75,6 +74,7 @@ cog.outl("//******************************************************************** #include "exception.h" #include "largest.h" #include "nullptr.h" +#include "placement_new.h" #undef ETL_FILE #define ETL_FILE "35" diff --git a/include/etl/list.h b/include/etl/list.h index 12a9436d..7c472738 100644 --- a/include/etl/list.h +++ b/include/etl/list.h @@ -33,14 +33,10 @@ SOFTWARE. #include -#include "private/new.h" - #include "platform.h" - #include "algorithm.h" #include "iterator.h" #include "functional.h" - #include "container.h" #include "pool.h" #include "exception.h" @@ -52,6 +48,7 @@ SOFTWARE. #include "memory.h" #include "iterator.h" #include "static_assert.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/include/etl/map.h b/include/etl/map.h index 5cdb6b4d..49663818 100755 --- a/include/etl/map.h +++ b/include/etl/map.h @@ -33,14 +33,10 @@ SOFTWARE. #include -#include "private/new.h" - #include "platform.h" - #include "algorithm.h" #include "iterator.h" #include "functional.h" - #include "container.h" #include "pool.h" #include "exception.h" @@ -51,6 +47,7 @@ SOFTWARE. #include "parameter_type.h" #include "iterator.h" #include "utility.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/include/etl/memory.h b/include/etl/memory.h index 3b5755c0..474cd449 100644 --- a/include/etl/memory.h +++ b/include/etl/memory.h @@ -38,7 +38,7 @@ SOFTWARE. #include "utility.h" #include "nullptr.h" #include "alignment.h" -#include "private/new.h" +#include "placement_new.h" #include #include diff --git a/include/etl/message_router.h b/include/etl/message_router.h index fdb34e78..c5b7ec1e 100644 --- a/include/etl/message_router.h +++ b/include/etl/message_router.h @@ -52,7 +52,6 @@ SOFTWARE. #define ETL_MESSAGE_ROUTER_INCLUDED #include -#include "private/new.h" #include "platform.h" #include "message.h" @@ -63,6 +62,7 @@ SOFTWARE. #include "exception.h" #include "largest.h" #include "nullptr.h" +#include "placement_new.h" #undef ETL_FILE #define ETL_FILE "35" diff --git a/include/etl/multimap.h b/include/etl/multimap.h index a7270419..81e323db 100644 --- a/include/etl/multimap.h +++ b/include/etl/multimap.h @@ -33,14 +33,10 @@ SOFTWARE. #include -#include "private/new.h" - #include "platform.h" - #include "algorithm.h" #include "iterator.h" #include "functional.h" - #include "container.h" #include "pool.h" #include "exception.h" @@ -51,6 +47,7 @@ SOFTWARE. #include "parameter_type.h" #include "iterator.h" #include "utility.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/include/etl/multiset.h b/include/etl/multiset.h index 7f4fb98f..16b9d7cc 100644 --- a/include/etl/multiset.h +++ b/include/etl/multiset.h @@ -33,14 +33,10 @@ SOFTWARE. #include -#include "private/new.h" - #include "platform.h" - #include "algorithm.h" #include "iterator.h" #include "functional.h" - #include "parameter_type.h" #include "container.h" #include "pool.h" @@ -50,6 +46,7 @@ SOFTWARE. #include "nullptr.h" #include "type_traits.h" #include "utility.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/include/etl/optional.h b/include/etl/optional.h index c57710c3..5ea0cd7b 100644 --- a/include/etl/optional.h +++ b/include/etl/optional.h @@ -31,15 +31,13 @@ SOFTWARE. #ifndef ETL_OPTIONAL_INCLUDED #define ETL_OPTIONAL_INCLUDED -#include "private/new.h" - #include "platform.h" #include "alignment.h" #include "type_traits.h" #include "exception.h" #include "error_handler.h" - #include "utility.h" +#include "placement_new.h" namespace etl { diff --git a/include/etl/packet.h b/include/etl/packet.h index f728dffc..5802ec35 100644 --- a/include/etl/packet.h +++ b/include/etl/packet.h @@ -31,12 +31,11 @@ SOFTWARE. #ifndef ETL_PACKET_INCLUDED #define ETL_PACKET_INCLUDED -#include "private/new.h" - #include "platform.h" #include "static_assert.h" #include "alignment.h" #include "utility.h" +#include "placement_new.h" #undef ETL_FILE #define ETL_FILE "38" diff --git a/include/etl/placement_new.h b/include/etl/placement_new.h new file mode 100644 index 00000000..15f5533f --- /dev/null +++ b/include/etl/placement_new.h @@ -0,0 +1,48 @@ +///\file + +/****************************************************************************** +The MIT License(MIT) + +Embedded Template Library. +https://github.com/ETLCPP/etl +https://www.etlcpp.com + +Copyright(c) 2019 jwellbelove + +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. +******************************************************************************/ + +#ifndef ETL_NEW_INCLUDED +#define ETL_NEW_INCLUDED +///\ingroup private + +#include "platform.h" + +#if ETL_USING_STD_NEW + #include +#else +// Define placement new if no new header is available +inline void* operator new(size_t, void* p) { return p; } +inline void* operator new[](size_t, void* p) { return p; } + +inline void operator delete(void*, void*) ETL_NOEXCEPT {} +inline void operator delete[](void*, void*) ETL_NOEXCEPT {} +#endif + +#endif diff --git a/include/etl/platform.h b/include/etl/platform.h index ac20d4a8..58156e19 100644 --- a/include/etl/platform.h +++ b/include/etl/platform.h @@ -102,6 +102,19 @@ SOFTWARE. // See if we can determine the OS we're compiling on, if haven't already done so in etl_profile.h #include "profiles/determine_development_os.h" +#include + +// Figure out if we can use the standard library header, if haven't already done so in etl_profile.h +#if !defined(ETL_USING_STD_NEW) + #if defined(__has_include) + #define ETL_USING_STD_NEW (__has_include() || __has_include()) + #elif ETL_NOT_USING_STL || (defined(ARDUINO) && defined(__AVR__)) + #define ETL_USING_STD_NEW 0 + #else + #define ETL_USING_STD_NEW 1 + #endif +#endif + // Option to force string construction from a character pointer to be explicit. #if defined(ETL_FORCE_EXPLICIT_STRING_CONVERSION_FROM_CHAR) #define ETL_EXPLICIT_STRING_FROM_CHAR explicit diff --git a/include/etl/pool.h b/include/etl/pool.h index 10da919e..5c7b83c1 100644 --- a/include/etl/pool.h +++ b/include/etl/pool.h @@ -32,9 +32,6 @@ SOFTWARE. #define ETL_POOL_INCLUDED #include "platform.h" - -#include "private/new.h" - #include "algorithm.h" #include "iterator.h" #include "utility.h" @@ -47,6 +44,7 @@ SOFTWARE. #include "alignment.h" #include "static_assert.h" #include "algorithm.h" +#include "placement_new.h" #undef ETL_FILE #define ETL_FILE "11" diff --git a/include/etl/queue.h b/include/etl/queue.h index 92ccb594..e2760418 100644 --- a/include/etl/queue.h +++ b/include/etl/queue.h @@ -34,8 +34,6 @@ SOFTWARE. #include #include -#include "private/new.h" - #include "platform.h" #include "container.h" #include "alignment.h" @@ -48,6 +46,7 @@ SOFTWARE. #include "memory_model.h" #include "integral_limits.h" #include "utility.h" +#include "placement_new.h" #undef ETL_FILE #define ETL_FILE "13" diff --git a/include/etl/queue_mpmc_mutex.h b/include/etl/queue_mpmc_mutex.h index 5dd658cb..5b422351 100644 --- a/include/etl/queue_mpmc_mutex.h +++ b/include/etl/queue_mpmc_mutex.h @@ -34,8 +34,6 @@ SOFTWARE. #include #include -#include "private/new.h" - #include "platform.h" #include "mutex.h" @@ -46,6 +44,7 @@ SOFTWARE. #include "memory_model.h" #include "integral_limits.h" #include "utility.h" +#include "placement_new.h" #undef ETL_FILE #define ETL_FILE "48" diff --git a/include/etl/queue_spsc_atomic.h b/include/etl/queue_spsc_atomic.h index 9f8d2546..7acbfa47 100644 --- a/include/etl/queue_spsc_atomic.h +++ b/include/etl/queue_spsc_atomic.h @@ -34,8 +34,6 @@ SOFTWARE. #include #include -#include "private/new.h" - #include "platform.h" #include "alignment.h" #include "parameter_type.h" @@ -43,6 +41,7 @@ SOFTWARE. #include "memory_model.h" #include "integral_limits.h" #include "utility.h" +#include "placement_new.h" #undef ETL_FILE #define ETL_FILE "47" diff --git a/include/etl/queue_spsc_isr.h b/include/etl/queue_spsc_isr.h index b423e06b..6da073d5 100644 --- a/include/etl/queue_spsc_isr.h +++ b/include/etl/queue_spsc_isr.h @@ -34,14 +34,13 @@ SOFTWARE. #include #include -#include "private/new.h" - #include "platform.h" #include "alignment.h" #include "parameter_type.h" #include "memory_model.h" #include "integral_limits.h" #include "utility.h" +#include "placement_new.h" #undef ETL_FILE #define ETL_FILE "46" diff --git a/include/etl/queue_spsc_locked.h b/include/etl/queue_spsc_locked.h index cce172d6..e4e4bdb1 100644 --- a/include/etl/queue_spsc_locked.h +++ b/include/etl/queue_spsc_locked.h @@ -34,8 +34,6 @@ SOFTWARE. #include #include -#include "private/new.h" - #include "platform.h" #include "alignment.h" #include "parameter_type.h" @@ -43,6 +41,7 @@ SOFTWARE. #include "integral_limits.h" #include "function.h" #include "utility.h" +#include "placement_new.h" #undef ETL_FILE #define ETL_FILE "54" diff --git a/include/etl/set.h b/include/etl/set.h index 2f826c49..f6e1699c 100755 --- a/include/etl/set.h +++ b/include/etl/set.h @@ -33,8 +33,6 @@ SOFTWARE. #include -#include "private/new.h" - #include "platform.h" #include "container.h" #include "pool.h" @@ -46,10 +44,10 @@ SOFTWARE. #include "parameter_type.h" #include "iterator.h" #include "utility.h" - #include "algorithm.h" #include "iterator.h" #include "functional.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/include/etl/stack.h b/include/etl/stack.h index 2dd50c34..cd80d921 100644 --- a/include/etl/stack.h +++ b/include/etl/stack.h @@ -34,8 +34,6 @@ SOFTWARE. #include #include -#include "private/new.h" - #include "platform.h" #include "algorithm.h" #include "utility.h" @@ -46,6 +44,7 @@ SOFTWARE. #include "error_handler.h" #include "debug_count.h" #include "type_traits.h" +#include "placement_new.h" #undef ETL_FILE #define ETL_FILE "15" diff --git a/include/etl/unordered_map.h b/include/etl/unordered_map.h index 0e7ef7f4..ad4ef776 100644 --- a/include/etl/unordered_map.h +++ b/include/etl/unordered_map.h @@ -33,8 +33,6 @@ SOFTWARE. #include -#include "private/new.h" - #include "platform.h" #include "algorithm.h" #include "iterator.h" @@ -53,6 +51,7 @@ SOFTWARE. #include "exception.h" #include "debug_count.h" #include "iterator.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/include/etl/unordered_multimap.h b/include/etl/unordered_multimap.h index 9182fb00..c7b5d63a 100644 --- a/include/etl/unordered_multimap.h +++ b/include/etl/unordered_multimap.h @@ -33,8 +33,6 @@ SOFTWARE. #include -#include "private/new.h" - #include "platform.h" #include "algorithm.h" #include "iterator.h" @@ -53,6 +51,7 @@ SOFTWARE. #include "exception.h" #include "debug_count.h" #include "iterator.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/include/etl/unordered_multiset.h b/include/etl/unordered_multiset.h index 34e0eee6..a36ed6bc 100644 --- a/include/etl/unordered_multiset.h +++ b/include/etl/unordered_multiset.h @@ -33,15 +33,11 @@ SOFTWARE. #include -#include "private/new.h" - #include "platform.h" - #include "algorithm.h" #include "iterator.h" #include "functional.h" #include "utility.h" - #include "container.h" #include "pool.h" #include "vector.h" @@ -54,6 +50,7 @@ SOFTWARE. #include "exception.h" #include "debug_count.h" #include "iterator.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/include/etl/unordered_set.h b/include/etl/unordered_set.h index 9b3ae0d0..b69d801f 100644 --- a/include/etl/unordered_set.h +++ b/include/etl/unordered_set.h @@ -33,8 +33,6 @@ SOFTWARE. #include -#include "private/new.h" - #include "platform.h" #include "algorithm.h" #include "iterator.h" @@ -53,6 +51,7 @@ SOFTWARE. #include "error_handler.h" #include "debug_count.h" #include "iterator.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/include/etl/variant.h b/include/etl/variant.h index 78ecaafe..7bfea8eb 100644 --- a/include/etl/variant.h +++ b/include/etl/variant.h @@ -33,8 +33,6 @@ SOFTWARE. #include -#include "private/new.h" - #include "platform.h" #include "utility.h" #include "array.h" @@ -46,6 +44,7 @@ SOFTWARE. #include "alignment.h" #include "error_handler.h" #include "null_type.h" +#include "placement_new.h" #if defined(ETL_COMPILER_KEIL) #pragma diag_suppress 940 diff --git a/include/etl/vector.h b/include/etl/vector.h index 90e237b0..dd2caea1 100644 --- a/include/etl/vector.h +++ b/include/etl/vector.h @@ -37,8 +37,6 @@ SOFTWARE. #include #include -#include "private/new.h" - #include "platform.h" #include "algorithm.h" #include "type_traits.h" @@ -53,6 +51,7 @@ SOFTWARE. #include "iterator.h" #include "functional.h" #include "static_assert.h" +#include "placement_new.h" #if ETL_CPP11_SUPPORTED && ETL_NOT_USING_STLPORT && ETL_USING_STL #include diff --git a/test/runtests.sh b/test/runtests.sh index a4a06e0b..6265495e 100644 --- a/test/runtests.sh +++ b/test/runtests.sh @@ -5,23 +5,23 @@ echo "********** GCC **********" >> etl_test_log.txt gcc --version | grep gcc >> etl_test_log.txt cmake --cmake-clean-cache -DNO_STL=OFF .. make -./etl_tests >> etl_test_log.txt +./etl_tests | tee etl_test_log.txt echo "********** GCC - No STL **********" >> etl_test_log.txt gcc --version | grep gcc >> etl_test_log.txt cmake --cmake-clean-cache -DNO_STL=ON .. make -./etl_tests >> etl_test_log.txt +./etl_tests | tee etl_test_log.txt echo "********** Clang **********" >> etl_test_log.txt clang --version | grep clang >> etl_test_log.txt export CC=clang export CXX=clang++ cmake --cmake-clean-cache -DNO_STL=OFF .. make -./etl_tests >> etl_test_log.txt +./etl_tests | tee etl_test_log.txt echo "********** Clang - No STL **********" >> etl_test_log.txt clang --version | grep clang >> etl_test_log.txt export CC=clang export CXX=clang++ cmake --cmake-clean-cache -DNO_STL=ON .. make -./etl_tests >> etl_test_log.txt +./etl_tests | tee etl_test_log.txt diff --git a/test/vs2019/etl.vcxproj b/test/vs2019/etl.vcxproj index 7fae2640..d1736446 100644 --- a/test/vs2019/etl.vcxproj +++ b/test/vs2019/etl.vcxproj @@ -1293,6 +1293,7 @@ + diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters index 2c69e527..36753b17 100644 --- a/test/vs2019/etl.vcxproj.filters +++ b/test/vs2019/etl.vcxproj.filters @@ -894,6 +894,9 @@ ETL\Containers + + ETL\Utilities + diff --git a/include/etl/private/new.h b/test/vs2019/new.h similarity index 83% rename from include/etl/private/new.h rename to test/vs2019/new.h index 45dac77b..d9161320 100644 --- a/include/etl/private/new.h +++ b/test/vs2019/new.h @@ -30,19 +30,18 @@ SOFTWARE. #ifndef ETL_NEW_INCLUDED #define ETL_NEW_INCLUDED -///\ingroup private -#include "../platform.h" +#include "platform.h" #ifdef ETL_NO_NEW_HEADER_AVAILABLE // Define placement new if no new header is available -inline void* operator new(size_t, void* const __p){ return __p; } -inline void* operator new[](size_t, void* const __p){ return __p; } +inline void* operator new(size_t, void* const __p) { return __p; } +inline void* operator new[](size_t, void* const __p) { return __p; } -inline void operator delete(void*, void* const){ } -inline void operator delete[](void*, void* const){ } +inline void operator delete(void*, void* const) { } +inline void operator delete[](void*, void* const) {} #else -#include + #include #endif #endif diff --git a/wslcopy.sh b/wslcopy.sh new file mode 100644 index 00000000..6d61fc3b --- /dev/null +++ b/wslcopy.sh @@ -0,0 +1 @@ + rsync -av --progress . /home/ubuntu/ --exclude etl/examples --exclude test/vs2019 --exclude test/vs2017 --exclude test/codeblocks