Merge branch 'development'

# Conflicts: # library.properties # src/container.h # support/Release notes.txt
ETLCPP · Jan 23, 2018 · c63efac · c63efac
1 parent efd52cf
commit c63efac
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Embedded Template Library
-version=10.11.1
+version=10.11.2
 author= John Wellbelove <[email protected]>
 maintainer=John Wellbelove <[email protected]>
 sentence=A C++ template library tailored for embedded systems.

diff --git a/src/platform.h b/src/platform.h
@@ -38,6 +38,13 @@ SOFTWARE.
   #define ETL_DEBUG
 #endif
 
+#undef ETL_CPP11_SUPPORTED
+#undef ETL_CPP14_SUPPORTED
+#undef ETL_NO_NULLPTR_SUPPORT
+#undef ETL_NO_LARGE_CHAR_SUPPORT
+#undef ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED
+#undef ETL_ATOMIC_SUPPORTED
+
 #include "etl_profile.h"
 
 #if ETL_CPP11_SUPPORTED

diff --git a/support/Release notes.txt b/support/Release notes.txt
@@ -1,4 +1,7 @@
 ===============================================================================
+10.11.2
+GCC compatibility changes.
+===============================================================================
 10.11.1
 GCC compatibility changes.
 ===============================================================================

diff --git a/test/ecl_user.h b/test/ecl_user.h
@@ -29,22 +29,20 @@ SOFTWARE.
 #ifndef __ECL_USER__
 #define __ECL_USER__
 
-#include "platform.h"
-
 #include <stdint.h>
 
-#if defined(ETL_COMPILER_GCC)
-  #define ECL_TIMER_TIMER_SEMAPHORE       uint32_t
-  #define ECL_TIMER_DISABLE_PROCESSING(x) __sync_fetch_and_add(&x, 1)
-  #define ECL_TIMER_ENABLE_PROCESSING(x)  __sync_fetch_and_sub(&x, 1)
-  #define ECL_TIMER_PROCESSING_ENABLED(x) (__sync_fetch_and_add(&x, 0) == 0)
-#else
+#if defined(_MSC_VER)
   #include <Windows.h>
 
   #define ECL_TIMER_TIMER_SEMAPHORE       uint32_t
   #define ECL_TIMER_DISABLE_PROCESSING(x) InterlockedIncrement((volatile long*)&x)
   #define ECL_TIMER_ENABLE_PROCESSING(x)  InterlockedDecrement((volatile long*)&x)
   #define ECL_TIMER_PROCESSING_ENABLED(x) (InterlockedAdd((volatile long*)&x, 0) == 0)
+#else
+  #define ECL_TIMER_TIMER_SEMAPHORE       uint32_t
+  #define ECL_TIMER_DISABLE_PROCESSING(x) __sync_fetch_and_add(&x, 1)
+  #define ECL_TIMER_ENABLE_PROCESSING(x)  __sync_fetch_and_sub(&x, 1)
+  #define ECL_TIMER_PROCESSING_ENABLED(x) (__sync_fetch_and_add(&x, 0) == 0)
 #endif
 
 #endif