Minor tidying

ETLCPP · May 12, 2020 · d8fcf01 · d8fcf01
1 parent 638d6ac
commit d8fcf01
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 15 deletions.
diff --git a/examples/ArmTimerCallbacks - C++/etl_profile.h b/examples/ArmTimerCallbacks - C++/etl_profile.h
@@ -10,6 +10,6 @@
 #define ETL_CALLBACK_TIMER_USE_ATOMIC_LOCK
 #define ETL_NO_STL
 
-#include "etl/profiles/auto.h"
+//#include "etl/profiles/auto.h"
 
 #endif
diff --git a/include/etl/platform.h b/include/etl/platform.h
@@ -54,29 +54,29 @@ SOFTWARE.
 // The ETL will use the STL, unless ETL_NO_STL is defined.
 // With this macro we can use '#if ETL_USING_STL' instead of '#if !ETL_NO_STL' in the code.
 #if defined(ETL_NO_STL)
-#define ETL_USING_STL     0
-#define ETL_NOT_USING_STL 1
+  #define ETL_USING_STL     0
+  #define ETL_NOT_USING_STL 1
 #else
-#define ETL_USING_STL     1
-#define ETL_NOT_USING_STL 0
+  #define ETL_USING_STL     1
+  #define ETL_NOT_USING_STL 0
 #endif
 
 // Helper macros for ETL_STLPORT.
 #if defined(ETL_STLPORT)
-#define ETL_USING_STLPORT     1
-#define ETL_NOT_USING_STLPORT 0
+  #define ETL_USING_STLPORT     1
+  #define ETL_NOT_USING_STLPORT 0
 #else
-#define ETL_USING_STLPORT     0
-#define ETL_NOT_USING_STLPORT 1
+  #define ETL_USING_STLPORT     0
+  #define ETL_NOT_USING_STLPORT 1
 #endif
 
 // Helper macro for ETL_NO_64BIT_TYPES.
 #if defined(ETL_NO_64BIT_TYPES)
-#define ETL_USING_64BIT_TYPES     0
-#define ETL_NOT_USING_64BIT_TYPES 1
+  #define ETL_USING_64BIT_TYPES     0
+  #define ETL_NOT_USING_64BIT_TYPES 1
 #else
-#define ETL_USING_64BIT_TYPES     1
-#define ETL_NOT_USING_64BIT_TYPES 0
+  #define ETL_USING_64BIT_TYPES     1
+  #define ETL_NOT_USING_64BIT_TYPES 0
 #endif
 
 // Figure out things about the compiler, if haven't already done so in etl_profile.h

diff --git a/include/etl/profiles/determine_compiler_language_support.h b/include/etl/profiles/determine_compiler_language_support.h
@@ -74,7 +74,7 @@ SOFTWARE.
 #endif
 
 // NAN not defined or Rowley CrossWorks
-#if !defined(NAN) || defined(__CROSSWORKS_ARM)
+#if !defined(NAN) || defined(__CROSSWORKS_ARM) || defined(ETL_COMPILER_ARM5)
   #if !defined(ETL_NO_CPP_NAN_SUPPORT)
     #define ETL_NO_CPP_NAN_SUPPORT
   #endif

diff --git a/include/etl/vector.h b/include/etl/vector.h
@@ -1284,6 +1284,9 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
+#ifdef ETL_IVECTOR_REPAIR_ENABLE
+    virtual
+#endif
     void repair()
 #ifdef ETL_IVECTOR_REPAIR_ENABLE
       ETL_OVERRIDE

diff --git a/test/etl_profile.h b/test/etl_profile.h
@@ -92,7 +92,7 @@ SOFTWARE.
 //#define ETL_OPTIONAL_FORCE_CPP03
 //#define ETL_LARGEST_TYPE_FORCE_CPP03
 
-#if ETL_NOT_USING_STL
+#if defined(ETL_NO_STL)
   #define ETL_TIMER_SEMAPHORE_TYPE uint32_t
 #endif
 

diff --git a/test/vs2019/etl.vcxproj b/test/vs2019/etl.vcxproj
@@ -1650,6 +1650,7 @@
     <ClCompile Include="..\test_xor_rotate_checksum.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\..\.circleci\config.yml" />
     <None Include="..\..\etl.pspimage" />
     <None Include="..\..\etl.xar" />
     <None Include="..\..\include\etl\generators\generate.bat" />

diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters
@@ -1375,6 +1375,9 @@
     <None Include="..\..\include\etl\generators\generate.bat">
       <Filter>Resource Files\Generators</Filter>
     </None>
+    <None Include="..\..\.circleci\config.yml">
+      <Filter>Resource Files\CI\CircleCI</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\include\etl\file_error_numbers.txt">