fixed StaticArrayT<>::_items initialization (based on #61)

* moved dev sources from /include to /development folder * fixed a static analysis issue in test_debug.cpp
andrew-gresyk · Nov 23, 2021 · efe9bef · efe9bef
1 parent f9134d5
commit efe9bef
Show file tree

Hide file tree

Showing 87 changed files with 667 additions and 703 deletions.
diff --git a/README.md b/README.md
@@ -94,6 +94,7 @@ Header-only heriarchical FSM framework in C++11, with fully statically-defined s
 - [DJuego](https://github.com/DJuego)
 - [Kevin Greene](https://github.com/kgreenek)
 - [Kjeld Mathias Petersen](https://github.com/DonMathi)
+- [Lau Bakman](https://github.com/lbakman)
 - Mehdi Houshmand
 - [mrcmry](https://github.com/mrcmry)
 - [Phil Nash](https://github.com/philsquared)

diff --git a/include/hfsm2/detail/containers/array.hpp → ...lopment/hfsm2/detail/containers/array.hpp b/include/hfsm2/detail/containers/array.hpp → ...lopment/hfsm2/detail/containers/array.hpp
@@ -46,7 +46,7 @@ class StaticArrayT final {
 	HFSM2_CONSTEXPR(11)	Index limit()									const noexcept	{ return CAPACITY;					}
 
 private:
-	Item _items[CAPACITY];
+	Item _items[CAPACITY] {};
 };
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

diff --git a/include/hfsm2/detail/containers/array.inl → ...lopment/hfsm2/detail/containers/array.inl b/include/hfsm2/detail/containers/array.inl → ...lopment/hfsm2/detail/containers/array.inl
diff --git a/...ude/hfsm2/detail/containers/bit_array.hpp → ...ent/hfsm2/detail/containers/bit_array.hpp b/...ude/hfsm2/detail/containers/bit_array.hpp → ...ent/hfsm2/detail/containers/bit_array.hpp
diff --git a/...ude/hfsm2/detail/containers/bit_array.inl → ...ent/hfsm2/detail/containers/bit_array.inl b/...ude/hfsm2/detail/containers/bit_array.inl → ...ent/hfsm2/detail/containers/bit_array.inl
diff --git a/...ude/hfsm2/detail/containers/task_list.hpp → ...ent/hfsm2/detail/containers/task_list.hpp b/...ude/hfsm2/detail/containers/task_list.hpp → ...ent/hfsm2/detail/containers/task_list.hpp
diff --git a/...ude/hfsm2/detail/containers/task_list.inl → ...ent/hfsm2/detail/containers/task_list.inl b/...ude/hfsm2/detail/containers/task_list.inl → ...ent/hfsm2/detail/containers/task_list.inl
diff --git a/include/hfsm2/detail/features/common.hpp → development/hfsm2/detail/features/common.hpp b/include/hfsm2/detail/features/common.hpp → development/hfsm2/detail/features/common.hpp
diff --git a/...fsm2/detail/features/logger_interface.hpp → ...fsm2/detail/features/logger_interface.hpp b/...fsm2/detail/features/logger_interface.hpp → ...fsm2/detail/features/logger_interface.hpp
diff --git a/...fsm2/detail/features/structure_report.hpp → ...fsm2/detail/features/structure_report.hpp b/...fsm2/detail/features/structure_report.hpp → ...fsm2/detail/features/structure_report.hpp
diff --git a/include/hfsm2/detail/root.hpp → development/hfsm2/detail/root.hpp b/include/hfsm2/detail/root.hpp → development/hfsm2/detail/root.hpp
diff --git a/include/hfsm2/detail/root.inl → development/hfsm2/detail/root.inl b/include/hfsm2/detail/root.inl → development/hfsm2/detail/root.inl
diff --git a/include/hfsm2/detail/root/control.hpp → development/hfsm2/detail/root/control.hpp b/include/hfsm2/detail/root/control.hpp → development/hfsm2/detail/root/control.hpp
diff --git a/include/hfsm2/detail/root/control.inl → development/hfsm2/detail/root/control.inl b/include/hfsm2/detail/root/control.inl → development/hfsm2/detail/root/control.inl
diff --git a/include/hfsm2/detail/root/plan.hpp → development/hfsm2/detail/root/plan.hpp b/include/hfsm2/detail/root/plan.hpp → development/hfsm2/detail/root/plan.hpp
diff --git a/include/hfsm2/detail/root/plan.inl → development/hfsm2/detail/root/plan.inl b/include/hfsm2/detail/root/plan.inl → development/hfsm2/detail/root/plan.inl
diff --git a/include/hfsm2/detail/root/plan_data.hpp → development/hfsm2/detail/root/plan_data.hpp b/include/hfsm2/detail/root/plan_data.hpp → development/hfsm2/detail/root/plan_data.hpp
diff --git a/include/hfsm2/detail/root/plan_data.inl → development/hfsm2/detail/root/plan_data.inl b/include/hfsm2/detail/root/plan_data.inl → development/hfsm2/detail/root/plan_data.inl
diff --git a/include/hfsm2/detail/root/registry.hpp → development/hfsm2/detail/root/registry.hpp b/include/hfsm2/detail/root/registry.hpp → development/hfsm2/detail/root/registry.hpp
diff --git a/include/hfsm2/detail/root/registry_1.inl → development/hfsm2/detail/root/registry_1.inl b/include/hfsm2/detail/root/registry_1.inl → development/hfsm2/detail/root/registry_1.inl
diff --git a/include/hfsm2/detail/root/registry_2.inl → development/hfsm2/detail/root/registry_2.inl b/include/hfsm2/detail/root/registry_2.inl → development/hfsm2/detail/root/registry_2.inl
diff --git a/include/hfsm2/detail/root/state_access.hpp → ...opment/hfsm2/detail/root/state_access.hpp b/include/hfsm2/detail/root/state_access.hpp → ...opment/hfsm2/detail/root/state_access.hpp
diff --git a/include/hfsm2/detail/shared/bit_stream.hpp → ...opment/hfsm2/detail/shared/bit_stream.hpp b/include/hfsm2/detail/shared/bit_stream.hpp → ...opment/hfsm2/detail/shared/bit_stream.hpp
diff --git a/include/hfsm2/detail/shared/bit_stream.inl → ...opment/hfsm2/detail/shared/bit_stream.inl b/include/hfsm2/detail/shared/bit_stream.inl → ...opment/hfsm2/detail/shared/bit_stream.inl
diff --git a/include/hfsm2/detail/shared/iterator.hpp → development/hfsm2/detail/shared/iterator.hpp b/include/hfsm2/detail/shared/iterator.hpp → development/hfsm2/detail/shared/iterator.hpp
diff --git a/include/hfsm2/detail/shared/macros_off.hpp → ...opment/hfsm2/detail/shared/macros_off.hpp b/include/hfsm2/detail/shared/macros_off.hpp → ...opment/hfsm2/detail/shared/macros_off.hpp
diff --git a/include/hfsm2/detail/shared/macros_on.hpp → ...lopment/hfsm2/detail/shared/macros_on.hpp b/include/hfsm2/detail/shared/macros_on.hpp → ...lopment/hfsm2/detail/shared/macros_on.hpp
diff --git a/include/hfsm2/detail/shared/random.hpp → development/hfsm2/detail/shared/random.hpp b/include/hfsm2/detail/shared/random.hpp → development/hfsm2/detail/shared/random.hpp
diff --git a/include/hfsm2/detail/shared/random.inl → development/hfsm2/detail/shared/random.inl b/include/hfsm2/detail/shared/random.inl → development/hfsm2/detail/shared/random.inl
diff --git a/include/hfsm2/detail/shared/type_list.hpp → ...lopment/hfsm2/detail/shared/type_list.hpp b/include/hfsm2/detail/shared/type_list.hpp → ...lopment/hfsm2/detail/shared/type_list.hpp
diff --git a/include/hfsm2/detail/shared/utility.hpp → development/hfsm2/detail/shared/utility.hpp b/include/hfsm2/detail/shared/utility.hpp → development/hfsm2/detail/shared/utility.hpp
diff --git a/include/hfsm2/detail/structure/composite.hpp → ...ment/hfsm2/detail/structure/composite.hpp b/include/hfsm2/detail/structure/composite.hpp → ...ment/hfsm2/detail/structure/composite.hpp
diff --git a/include/hfsm2/detail/structure/composite.inl → ...ment/hfsm2/detail/structure/composite.inl b/include/hfsm2/detail/structure/composite.inl → ...ment/hfsm2/detail/structure/composite.inl
diff --git a/.../hfsm2/detail/structure/composite_sub.hpp → .../hfsm2/detail/structure/composite_sub.hpp b/.../hfsm2/detail/structure/composite_sub.hpp → .../hfsm2/detail/structure/composite_sub.hpp
diff --git a/...fsm2/detail/structure/composite_sub_1.inl → ...fsm2/detail/structure/composite_sub_1.inl b/...fsm2/detail/structure/composite_sub_1.inl → ...fsm2/detail/structure/composite_sub_1.inl
diff --git a/...fsm2/detail/structure/composite_sub_2.inl → ...fsm2/detail/structure/composite_sub_2.inl b/...fsm2/detail/structure/composite_sub_2.inl → ...fsm2/detail/structure/composite_sub_2.inl
diff --git a/include/hfsm2/detail/structure/forward.hpp → ...opment/hfsm2/detail/structure/forward.hpp b/include/hfsm2/detail/structure/forward.hpp → ...opment/hfsm2/detail/structure/forward.hpp
diff --git a/...ude/hfsm2/detail/structure/injections.hpp → ...ent/hfsm2/detail/structure/injections.hpp b/...ude/hfsm2/detail/structure/injections.hpp → ...ent/hfsm2/detail/structure/injections.hpp
diff --git a/...ude/hfsm2/detail/structure/injections.inl → ...ent/hfsm2/detail/structure/injections.inl b/...ude/hfsm2/detail/structure/injections.inl → ...ent/hfsm2/detail/structure/injections.inl
diff --git a/...ude/hfsm2/detail/structure/orthogonal.hpp → ...ent/hfsm2/detail/structure/orthogonal.hpp b/...ude/hfsm2/detail/structure/orthogonal.hpp → ...ent/hfsm2/detail/structure/orthogonal.hpp
diff --git a/...ude/hfsm2/detail/structure/orthogonal.inl → ...ent/hfsm2/detail/structure/orthogonal.inl b/...ude/hfsm2/detail/structure/orthogonal.inl → ...ent/hfsm2/detail/structure/orthogonal.inl
diff --git a/...hfsm2/detail/structure/orthogonal_sub.hpp → ...hfsm2/detail/structure/orthogonal_sub.hpp b/...hfsm2/detail/structure/orthogonal_sub.hpp → ...hfsm2/detail/structure/orthogonal_sub.hpp
diff --git a/...sm2/detail/structure/orthogonal_sub_1.inl → ...sm2/detail/structure/orthogonal_sub_1.inl b/...sm2/detail/structure/orthogonal_sub_1.inl → ...sm2/detail/structure/orthogonal_sub_1.inl
diff --git a/...sm2/detail/structure/orthogonal_sub_2.inl → ...sm2/detail/structure/orthogonal_sub_2.inl b/...sm2/detail/structure/orthogonal_sub_2.inl → ...sm2/detail/structure/orthogonal_sub_2.inl
diff --git a/include/hfsm2/detail/structure/state.hpp → development/hfsm2/detail/structure/state.hpp b/include/hfsm2/detail/structure/state.hpp → development/hfsm2/detail/structure/state.hpp
diff --git a/include/hfsm2/detail/structure/state.inl → development/hfsm2/detail/structure/state.inl b/include/hfsm2/detail/structure/state.inl → development/hfsm2/detail/structure/state.inl
diff --git a/include/hfsm2/machine_dev.hpp → development/hfsm2/machine_dev.hpp b/include/hfsm2/machine_dev.hpp → development/hfsm2/machine_dev.hpp
@@ -1,5 +1,5 @@
 // HFSM2 (hierarchical state machine for games and interactive applications)
-// 1.11.2 (2021-10-28)
+// 1.12.0 (2021-11-24)
 //
 // Created by Andrew Gresyk
 //
@@ -32,8 +32,8 @@
 #pragma once
 
 #define HFSM2_VERSION_MAJOR 1
-#define HFSM2_VERSION_MINOR 11
-#define HFSM2_VERSION_PATCH 2
+#define HFSM2_VERSION_MINOR 12
+#define HFSM2_VERSION_PATCH 0
 
 #define HFSM2_VERSION (10000 * HFSM2_VERSION_MAJOR + 100 * HFSM2_VERSION_MINOR + HFSM2_VERSION_PATCH)
 

diff --git a/include/hfsm2/machine.hpp b/include/hfsm2/machine.hpp
@@ -1,5 +1,5 @@
 // HFSM2 (hierarchical state machine for games and interactive applications)
-// 1.11.2 (2021-10-28)
+// 1.12.0 (2021-11-24)
 //
 // Created by Andrew Gresyk
 //
@@ -32,8 +32,8 @@
 #pragma once
 
 #define HFSM2_VERSION_MAJOR 1
-#define HFSM2_VERSION_MINOR 11
-#define HFSM2_VERSION_PATCH 2
+#define HFSM2_VERSION_MINOR 12
+#define HFSM2_VERSION_PATCH 0
 
 #define HFSM2_VERSION (10000 * HFSM2_VERSION_MAJOR + 100 * HFSM2_VERSION_MINOR + HFSM2_VERSION_PATCH)
 

diff --git a/projects/visual-studio/advanced_event_handling-14.vcxproj b/projects/visual-studio/advanced_event_handling-14.vcxproj
@@ -64,19 +64,19 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-14.props" />
+    <Import Project="shared-vs-14.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-14.props" />
+    <Import Project="shared-vs-14.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-14.props" />
+    <Import Project="shared-vs-14.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-14.props" />
+    <Import Project="shared-vs-14.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/projects/visual-studio/advanced_event_handling-15.vcxproj b/projects/visual-studio/advanced_event_handling-15.vcxproj
@@ -64,19 +64,19 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/projects/visual-studio/advanced_event_handling-16.vcxproj b/projects/visual-studio/advanced_event_handling-16.vcxproj
@@ -88,27 +88,27 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ASan|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ASan|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/projects/visual-studio/basic_audio_player-14.vcxproj b/projects/visual-studio/basic_audio_player-14.vcxproj
@@ -64,19 +64,19 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-14.props" />
+    <Import Project="shared-vs-14.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-14.props" />
+    <Import Project="shared-vs-14.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-14.props" />
+    <Import Project="shared-vs-14.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-14.props" />
+    <Import Project="shared-vs-14.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/projects/visual-studio/basic_audio_player-15.vcxproj b/projects/visual-studio/basic_audio_player-15.vcxproj
@@ -64,19 +64,19 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/projects/visual-studio/basic_audio_player-16.vcxproj b/projects/visual-studio/basic_audio_player-16.vcxproj
@@ -88,27 +88,27 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ASan|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ASan|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/projects/visual-studio/basic_traffic_light-14.vcxproj b/projects/visual-studio/basic_traffic_light-14.vcxproj
@@ -64,19 +64,19 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-14.props" />
+    <Import Project="shared-vs-14.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-14.props" />
+    <Import Project="shared-vs-14.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-14.props" />
+    <Import Project="shared-vs-14.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-14.props" />
+    <Import Project="shared-vs-14.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/projects/visual-studio/basic_traffic_light-15.vcxproj b/projects/visual-studio/basic_traffic_light-15.vcxproj
@@ -64,19 +64,19 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/projects/visual-studio/basic_traffic_light-16.vcxproj b/projects/visual-studio/basic_traffic_light-16.vcxproj
@@ -88,27 +88,27 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ASan|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ASan|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="shared-15.props" />
+    <Import Project="shared-vs-15.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">