From 1dff2aa6547f2af225e57083d1f4fe15593361f4 Mon Sep 17 00:00:00 2001 From: Tibor Molnar Date: Thu, 21 Sep 2017 13:30:45 +0200 Subject: [PATCH 1/9] yasmine 1.4.0 --- build/use_boost.props | 4 +- build/yasmine.props | 1 + build/yasmine_clang.props | 26 + externals/essentials/source/conversion.cpp | 5 +- yasmine.sln | 630 ++++++++++++--------- 5 files changed, 400 insertions(+), 266 deletions(-) create mode 100644 build/yasmine_clang.props diff --git a/build/use_boost.props b/build/use_boost.props index b62e3b1..7ad4ecc 100644 --- a/build/use_boost.props +++ b/build/use_boost.props @@ -2,8 +2,8 @@ - ..\..\..\..\..\3rd party\boost\Content\boost_1_60_0 - ..\..\..\..\..\3rd party\boost\Content\boost_1_60_0\stage\VS2015\$(Platform)\lib + ..\..\..\..\..\3rd party\boost\Content\boost_1_65_1 + ..\..\..\..\..\3rd party\boost\Content\boost_1_65_1\stage\$(PlatformToolsetVersion)\$(Platform)\lib diff --git a/build/yasmine.props b/build/yasmine.props index 07e5b07..de0e33c 100644 --- a/build/yasmine.props +++ b/build/yasmine.props @@ -14,6 +14,7 @@ false true include;include_impl;%(AdditionalIncludeDirectories) + /D "_STL_WARNING_LEVEL=3" %(AdditionalOptions) diff --git a/build/yasmine_clang.props b/build/yasmine_clang.props new file mode 100644 index 0000000..2daa0b3 --- /dev/null +++ b/build/yasmine_clang.props @@ -0,0 +1,26 @@ + + + + + + $(SolutionDir)$(Platform)\$(Configuration)\ + + + + c11 + + + + + c++1y + true + Enabled + true + NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + EnableAllWarnings + FullDebug + + + + + \ No newline at end of file diff --git a/externals/essentials/source/conversion.cpp b/externals/essentials/source/conversion.cpp index 21ee550..4e0ff74 100644 --- a/externals/essentials/source/conversion.cpp +++ b/externals/essentials/source/conversion.cpp @@ -12,6 +12,7 @@ #include #include +#include #ifndef SX_CPP03_BOOST #include @@ -85,7 +86,7 @@ std::string to_string( const int _value ) std::string to_upper( const std::string& _value ) { std::string value_caps = _value; - std::transform( value_caps.begin(), value_caps.end(), value_caps.begin(), ::toupper ); + std::transform( value_caps.begin(), value_caps.end(), value_caps.begin(), static_cast< int( *)( int ) >( ::std::toupper ) ); return( value_caps ); } @@ -94,7 +95,7 @@ std::string to_upper( const std::string& _value ) std::string to_lower( const std::string& _value ) { std::string value_to_lower = _value; - std::transform( value_to_lower.begin(), value_to_lower.end(), value_to_lower.begin(), ::tolower ); + std::transform( value_to_lower.begin(), value_to_lower.end(), value_to_lower.begin(), static_cast< int( *)( int ) >( ::std::tolower ) ); return( value_to_lower ); } diff --git a/yasmine.sln b/yasmine.sln index 65b4d4c..c957089 100644 --- a/yasmine.sln +++ b/yasmine.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26730.16 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyasmine", "libyasmine\libyasmine.vcxproj", "{A728DDFB-BE51-49B5-8593-4E89E024A500}" EndProject @@ -109,7 +109,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "version", "version", "{520E version.txt = version.txt EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unhandled_event_handler_example", "examples\unhandled_event_handler_example\unhandled_event_handler_example.vcxproj", "{E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unhandled_event_handler_example", "examples\unhandled_event_handler_example\unhandled_event_handler_example.vcxproj", "{AE8A7631-2145-4356-B430-FD40416B9523}" ProjectSection(ProjectDependencies) = postProject {A728DDFB-BE51-49B5-8593-4E89E024A500} = {A728DDFB-BE51-49B5-8593-4E89E024A500} EndProjectSection @@ -122,16 +122,20 @@ Global Debug - Clang|x64 = Debug - Clang|x64 Debug - VS 2013|Win32 = Debug - VS 2013|Win32 Debug - VS 2013|x64 = Debug - VS 2013|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 + Debug - VS 2015|Win32 = Debug - VS 2015|Win32 + Debug - VS 2015|x64 = Debug - VS 2015|x64 + Debug - VS 2017|Win32 = Debug - VS 2017|Win32 + Debug - VS 2017|x64 = Debug - VS 2017|x64 Release - C++ 03|Win32 = Release - C++ 03|Win32 Release - C++ 03|x64 = Release - C++ 03|x64 Release - Clang|Win32 = Release - Clang|Win32 Release - Clang|x64 = Release - Clang|x64 Release - VS 2013|Win32 = Release - VS 2013|Win32 Release - VS 2013|x64 = Release - VS 2013|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 + Release - VS 2015|Win32 = Release - VS 2015|Win32 + Release - VS 2015|x64 = Release - VS 2015|x64 + Release - VS 2017|Win32 = Release - VS 2017|Win32 + Release - VS 2017|x64 = Release - VS 2017|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug - C++ 03|Win32.ActiveCfg = Debug - C++ 03|Win32 @@ -146,10 +150,14 @@ Global {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug - VS 2013|Win32.Build.0 = Debug - VS 2013|Win32 {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug - VS 2013|x64.ActiveCfg = Debug - VS 2013|x64 {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug - VS 2013|x64.Build.0 = Debug - VS 2013|x64 - {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug|Win32.ActiveCfg = Debug|Win32 - {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug|Win32.Build.0 = Debug|Win32 - {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug|x64.ActiveCfg = Debug|x64 - {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug|x64.Build.0 = Debug|x64 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug - VS 2015|Win32.ActiveCfg = Debug - VS 2015|Win32 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug - VS 2015|Win32.Build.0 = Debug - VS 2015|Win32 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug - VS 2015|x64.ActiveCfg = Debug - VS 2015|x64 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug - VS 2015|x64.Build.0 = Debug - VS 2015|x64 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug - VS 2017|Win32.ActiveCfg = Debug - VS 2017|Win32 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug - VS 2017|Win32.Build.0 = Debug - VS 2017|Win32 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug - VS 2017|x64.ActiveCfg = Debug - VS 2017|x64 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Debug - VS 2017|x64.Build.0 = Debug - VS 2017|x64 {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release - C++ 03|Win32.ActiveCfg = Release - C++ 03|Win32 {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release - C++ 03|Win32.Build.0 = Release - C++ 03|Win32 {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release - C++ 03|x64.ActiveCfg = Release - C++ 03|x64 @@ -162,202 +170,253 @@ Global {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release - VS 2013|Win32.Build.0 = Release - VS 2013|Win32 {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release - VS 2013|x64.ActiveCfg = Release - VS 2013|x64 {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release - VS 2013|x64.Build.0 = Release - VS 2013|x64 - {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release|Win32.ActiveCfg = Release|Win32 - {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release|Win32.Build.0 = Release|Win32 - {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release|x64.ActiveCfg = Release|x64 - {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release|x64.Build.0 = Release|x64 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release - VS 2015|Win32.ActiveCfg = Release - VS 2015|Win32 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release - VS 2015|Win32.Build.0 = Release - VS 2015|Win32 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release - VS 2015|x64.ActiveCfg = Release - VS 2015|x64 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release - VS 2015|x64.Build.0 = Release - VS 2015|x64 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release - VS 2017|Win32.ActiveCfg = Release - VS 2017|Win32 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release - VS 2017|Win32.Build.0 = Release - VS 2017|Win32 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release - VS 2017|x64.ActiveCfg = Release - VS 2017|x64 + {A728DDFB-BE51-49B5-8593-4E89E024A500}.Release - VS 2017|x64.Build.0 = Release - VS 2017|x64 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - C++ 03|Win32.ActiveCfg = Debug - C++ 03|Win32 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - C++ 03|Win32.Build.0 = Debug - C++ 03|Win32 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - C++ 03|x64.ActiveCfg = Debug - C++ 03|x64 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - C++ 03|x64.Build.0 = Debug - C++ 03|x64 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - Clang|Win32.ActiveCfg = Debug - C++ 03|Win32 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - Clang|Win32.Build.0 = Debug - C++ 03|Win32 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - Clang|x64.ActiveCfg = Debug - C++ 03|x64 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - Clang|x64.Build.0 = Debug - C++ 03|x64 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - Clang|Win32.ActiveCfg = Debug - Clang|Win32 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - Clang|Win32.Build.0 = Debug - Clang|Win32 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - Clang|x64.ActiveCfg = Debug - Clang|x64 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - Clang|x64.Build.0 = Debug - Clang|x64 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - VS 2013|Win32.ActiveCfg = Debug - VS 2013|Win32 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - VS 2013|Win32.Build.0 = Debug - VS 2013|Win32 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - VS 2013|x64.ActiveCfg = Debug - VS 2013|x64 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - VS 2013|x64.Build.0 = Debug - VS 2013|x64 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug|Win32.ActiveCfg = Debug|Win32 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug|Win32.Build.0 = Debug|Win32 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug|x64.ActiveCfg = Debug|x64 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug|x64.Build.0 = Debug|x64 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - VS 2015|Win32.ActiveCfg = Debug - VS 2015|Win32 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - VS 2015|Win32.Build.0 = Debug - VS 2015|Win32 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - VS 2015|x64.ActiveCfg = Debug - VS 2015|x64 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - VS 2015|x64.Build.0 = Debug - VS 2015|x64 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - VS 2017|Win32.ActiveCfg = Debug - VS 2017|Win32 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - VS 2017|Win32.Build.0 = Debug - VS 2017|Win32 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Debug - VS 2017|x64.ActiveCfg = Debug - VS 2017|x64 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - C++ 03|Win32.ActiveCfg = Release - C++ 03|Win32 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - C++ 03|Win32.Build.0 = Release - C++ 03|Win32 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - C++ 03|x64.ActiveCfg = Release - C++ 03|x64 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - C++ 03|x64.Build.0 = Release - C++ 03|x64 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - Clang|Win32.ActiveCfg = Release - C++ 03|Win32 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - Clang|Win32.Build.0 = Release - C++ 03|Win32 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - Clang|x64.ActiveCfg = Release - C++ 03|x64 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - Clang|x64.Build.0 = Release - C++ 03|x64 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - Clang|Win32.ActiveCfg = Release - Clang|Win32 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - Clang|Win32.Build.0 = Release - Clang|Win32 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - Clang|x64.ActiveCfg = Release - Clang|x64 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - Clang|x64.Build.0 = Release - Clang|x64 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - VS 2013|Win32.ActiveCfg = Release - VS 2013|Win32 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - VS 2013|Win32.Build.0 = Release - VS 2013|Win32 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - VS 2013|x64.ActiveCfg = Release - VS 2013|x64 {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - VS 2013|x64.Build.0 = Release - VS 2013|x64 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release|Win32.ActiveCfg = Release|Win32 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release|Win32.Build.0 = Release|Win32 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release|x64.ActiveCfg = Release|x64 - {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release|x64.Build.0 = Release|x64 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - VS 2015|Win32.ActiveCfg = Release - VS 2015|Win32 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - VS 2015|Win32.Build.0 = Release - VS 2015|Win32 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - VS 2015|x64.ActiveCfg = Release - VS 2015|x64 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - VS 2015|x64.Build.0 = Release - VS 2015|x64 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - VS 2017|Win32.ActiveCfg = Release - VS 2017|Win32 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - VS 2017|Win32.Build.0 = Release - VS 2017|Win32 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - VS 2017|x64.ActiveCfg = Release - VS 2017|x64 + {C231C585-F237-4F08-8BF5-8DC7106599D4}.Release - VS 2017|x64.Build.0 = Release - VS 2017|x64 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - C++ 03|Win32.ActiveCfg = Debug - C++ 03|Win32 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - C++ 03|Win32.Build.0 = Debug - C++ 03|Win32 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - C++ 03|x64.ActiveCfg = Debug - C++ 03|x64 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - C++ 03|x64.Build.0 = Debug - C++ 03|x64 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - Clang|Win32.ActiveCfg = Debug - C++ 03|Win32 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - Clang|Win32.Build.0 = Debug - C++ 03|Win32 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - Clang|x64.ActiveCfg = Debug - C++ 03|x64 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - Clang|x64.Build.0 = Debug - C++ 03|x64 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - Clang|Win32.ActiveCfg = Debug - Clang|Win32 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - Clang|Win32.Build.0 = Debug - Clang|Win32 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - Clang|x64.ActiveCfg = Debug - Clang|x64 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - Clang|x64.Build.0 = Debug - Clang|x64 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - VS 2013|Win32.ActiveCfg = Debug - VS 2013|Win32 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - VS 2013|Win32.Build.0 = Debug - VS 2013|Win32 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - VS 2013|x64.ActiveCfg = Debug - VS 2013|x64 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - VS 2013|x64.Build.0 = Debug - VS 2013|x64 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug|Win32.ActiveCfg = Debug|Win32 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug|Win32.Build.0 = Debug|Win32 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug|x64.ActiveCfg = Debug|x64 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug|x64.Build.0 = Debug|x64 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - VS 2015|Win32.ActiveCfg = Debug - VS 2015|Win32 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - VS 2015|Win32.Build.0 = Debug - VS 2015|Win32 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - VS 2015|x64.ActiveCfg = Debug - VS 2015|x64 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - VS 2015|x64.Build.0 = Debug - VS 2015|x64 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - VS 2017|Win32.ActiveCfg = Debug - VS 2017|Win32 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - VS 2017|Win32.Build.0 = Debug - VS 2017|Win32 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - VS 2017|x64.ActiveCfg = Debug - VS 2017|x64 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Debug - VS 2017|x64.Build.0 = Debug - VS 2017|x64 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - C++ 03|Win32.ActiveCfg = Release - C++ 03|Win32 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - C++ 03|Win32.Build.0 = Release - C++ 03|Win32 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - C++ 03|x64.ActiveCfg = Release - C++ 03|x64 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - C++ 03|x64.Build.0 = Release - C++ 03|x64 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - Clang|Win32.ActiveCfg = Release - C++ 03|Win32 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - Clang|Win32.Build.0 = Release - C++ 03|Win32 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - Clang|x64.ActiveCfg = Release - C++ 03|x64 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - Clang|x64.Build.0 = Release - C++ 03|x64 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - Clang|Win32.ActiveCfg = Release - Clang|Win32 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - Clang|Win32.Build.0 = Release - Clang|Win32 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - Clang|x64.ActiveCfg = Release - Clang|x64 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - Clang|x64.Build.0 = Release - Clang|x64 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - VS 2013|Win32.ActiveCfg = Release - VS 2013|Win32 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - VS 2013|Win32.Build.0 = Release - VS 2013|Win32 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - VS 2013|x64.ActiveCfg = Release - VS 2013|x64 {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - VS 2013|x64.Build.0 = Release - VS 2013|x64 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release|Win32.ActiveCfg = Release|Win32 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release|Win32.Build.0 = Release|Win32 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release|x64.ActiveCfg = Release|x64 - {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release|x64.Build.0 = Release|x64 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - VS 2015|Win32.ActiveCfg = Release - VS 2015|Win32 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - VS 2015|Win32.Build.0 = Release - VS 2015|Win32 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - VS 2015|x64.ActiveCfg = Release - VS 2015|x64 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - VS 2015|x64.Build.0 = Release - VS 2015|x64 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - VS 2017|Win32.ActiveCfg = Release - VS 2017|Win32 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - VS 2017|Win32.Build.0 = Release - VS 2017|Win32 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - VS 2017|x64.ActiveCfg = Release - VS 2017|x64 + {DDCFB59A-D19C-4382-ACFD-747105EB8D03}.Release - VS 2017|x64.Build.0 = Release - VS 2017|x64 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - C++ 03|Win32.ActiveCfg = Debug - C++ 03|Win32 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - C++ 03|Win32.Build.0 = Debug - C++ 03|Win32 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - C++ 03|x64.ActiveCfg = Debug - C++ 03|x64 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - C++ 03|x64.Build.0 = Debug - C++ 03|x64 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - Clang|Win32.ActiveCfg = Debug - C++ 03|Win32 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - Clang|Win32.Build.0 = Debug - C++ 03|Win32 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - Clang|x64.ActiveCfg = Debug - C++ 03|x64 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - Clang|x64.Build.0 = Debug - C++ 03|x64 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - Clang|Win32.ActiveCfg = Debug - Clang|Win32 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - Clang|Win32.Build.0 = Debug - Clang|Win32 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - Clang|x64.ActiveCfg = Debug - Clang|x64 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - Clang|x64.Build.0 = Debug - Clang|x64 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - VS 2013|Win32.ActiveCfg = Debug - VS 2013|Win32 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - VS 2013|Win32.Build.0 = Debug - VS 2013|Win32 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - VS 2013|x64.ActiveCfg = Debug - VS 2013|x64 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - VS 2013|x64.Build.0 = Debug - VS 2013|x64 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug|Win32.ActiveCfg = Debug|Win32 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug|Win32.Build.0 = Debug|Win32 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug|x64.ActiveCfg = Debug|x64 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug|x64.Build.0 = Debug|x64 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - VS 2015|Win32.ActiveCfg = Debug - VS 2015|Win32 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - VS 2015|Win32.Build.0 = Debug - VS 2015|Win32 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - VS 2015|x64.ActiveCfg = Debug - VS 2015|x64 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - VS 2015|x64.Build.0 = Debug - VS 2015|x64 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - VS 2017|Win32.ActiveCfg = Debug - VS 2017|Win32 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - VS 2017|Win32.Build.0 = Debug - VS 2017|Win32 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - VS 2017|x64.ActiveCfg = Debug - VS 2017|x64 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Debug - VS 2017|x64.Build.0 = Debug - VS 2017|x64 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - C++ 03|Win32.ActiveCfg = Release - C++ 03|Win32 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - C++ 03|Win32.Build.0 = Release - C++ 03|Win32 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - C++ 03|x64.ActiveCfg = Release - C++ 03|x64 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - C++ 03|x64.Build.0 = Release - C++ 03|x64 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - Clang|Win32.ActiveCfg = Release - C++ 03|Win32 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - Clang|Win32.Build.0 = Release - C++ 03|Win32 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - Clang|x64.ActiveCfg = Release - C++ 03|x64 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - Clang|x64.Build.0 = Release - C++ 03|x64 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - Clang|Win32.ActiveCfg = Release - Clang|Win32 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - Clang|Win32.Build.0 = Release - Clang|Win32 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - Clang|x64.ActiveCfg = Release - Clang|x64 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - Clang|x64.Build.0 = Release - Clang|x64 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - VS 2013|Win32.ActiveCfg = Release - VS 2013|Win32 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - VS 2013|Win32.Build.0 = Release - VS 2013|Win32 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - VS 2013|x64.ActiveCfg = Release - VS 2013|x64 {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - VS 2013|x64.Build.0 = Release - VS 2013|x64 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release|Win32.ActiveCfg = Release|Win32 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release|Win32.Build.0 = Release|Win32 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release|x64.ActiveCfg = Release|x64 - {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release|x64.Build.0 = Release|x64 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - VS 2015|Win32.ActiveCfg = Release - VS 2015|Win32 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - VS 2015|Win32.Build.0 = Release - VS 2015|Win32 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - VS 2015|x64.ActiveCfg = Release - VS 2015|x64 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - VS 2015|x64.Build.0 = Release - VS 2015|x64 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - VS 2017|Win32.ActiveCfg = Release - VS 2017|Win32 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - VS 2017|Win32.Build.0 = Release - VS 2017|Win32 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - VS 2017|x64.ActiveCfg = Release - VS 2017|x64 + {5FA6552A-6FFB-44DE-BEBA-49FD1F1701EA}.Release - VS 2017|x64.Build.0 = Release - VS 2017|x64 {44767840-E79D-4049-B97B-867D32783090}.Debug - C++ 03|Win32.ActiveCfg = Debug - C++ 03|Win32 {44767840-E79D-4049-B97B-867D32783090}.Debug - C++ 03|Win32.Build.0 = Debug - C++ 03|Win32 {44767840-E79D-4049-B97B-867D32783090}.Debug - C++ 03|x64.ActiveCfg = Debug - C++ 03|x64 {44767840-E79D-4049-B97B-867D32783090}.Debug - C++ 03|x64.Build.0 = Debug - C++ 03|x64 - {44767840-E79D-4049-B97B-867D32783090}.Debug - Clang|Win32.ActiveCfg = Debug - C++ 03|Win32 - {44767840-E79D-4049-B97B-867D32783090}.Debug - Clang|Win32.Build.0 = Debug - C++ 03|Win32 - {44767840-E79D-4049-B97B-867D32783090}.Debug - Clang|x64.ActiveCfg = Debug - C++ 03|x64 - {44767840-E79D-4049-B97B-867D32783090}.Debug - Clang|x64.Build.0 = Debug - C++ 03|x64 + {44767840-E79D-4049-B97B-867D32783090}.Debug - Clang|Win32.ActiveCfg = Debug - Clang|Win32 + {44767840-E79D-4049-B97B-867D32783090}.Debug - Clang|Win32.Build.0 = Debug - Clang|Win32 + {44767840-E79D-4049-B97B-867D32783090}.Debug - Clang|x64.ActiveCfg = Debug - Clang|x64 + {44767840-E79D-4049-B97B-867D32783090}.Debug - Clang|x64.Build.0 = Debug - Clang|x64 {44767840-E79D-4049-B97B-867D32783090}.Debug - VS 2013|Win32.ActiveCfg = Debug - VS 2013|Win32 {44767840-E79D-4049-B97B-867D32783090}.Debug - VS 2013|Win32.Build.0 = Debug - VS 2013|Win32 {44767840-E79D-4049-B97B-867D32783090}.Debug - VS 2013|x64.ActiveCfg = Debug - VS 2013|x64 {44767840-E79D-4049-B97B-867D32783090}.Debug - VS 2013|x64.Build.0 = Debug - VS 2013|x64 - {44767840-E79D-4049-B97B-867D32783090}.Debug|Win32.ActiveCfg = Debug|Win32 - {44767840-E79D-4049-B97B-867D32783090}.Debug|Win32.Build.0 = Debug|Win32 - {44767840-E79D-4049-B97B-867D32783090}.Debug|x64.ActiveCfg = Debug|x64 - {44767840-E79D-4049-B97B-867D32783090}.Debug|x64.Build.0 = Debug|x64 + {44767840-E79D-4049-B97B-867D32783090}.Debug - VS 2015|Win32.ActiveCfg = Debug - VS 2015|Win32 + {44767840-E79D-4049-B97B-867D32783090}.Debug - VS 2015|Win32.Build.0 = Debug - VS 2015|Win32 + {44767840-E79D-4049-B97B-867D32783090}.Debug - VS 2015|x64.ActiveCfg = Debug - VS 2015|x64 + {44767840-E79D-4049-B97B-867D32783090}.Debug - VS 2015|x64.Build.0 = Debug - VS 2015|x64 + {44767840-E79D-4049-B97B-867D32783090}.Debug - VS 2017|Win32.ActiveCfg = Debug - VS 2017|Win32 + {44767840-E79D-4049-B97B-867D32783090}.Debug - VS 2017|Win32.Build.0 = Debug - VS 2017|Win32 + {44767840-E79D-4049-B97B-867D32783090}.Debug - VS 2017|x64.ActiveCfg = Debug - VS 2017|x64 + {44767840-E79D-4049-B97B-867D32783090}.Debug - VS 2017|x64.Build.0 = Debug - VS 2017|x64 {44767840-E79D-4049-B97B-867D32783090}.Release - C++ 03|Win32.ActiveCfg = Release - C++ 03|Win32 {44767840-E79D-4049-B97B-867D32783090}.Release - C++ 03|Win32.Build.0 = Release - C++ 03|Win32 {44767840-E79D-4049-B97B-867D32783090}.Release - C++ 03|x64.ActiveCfg = Release - C++ 03|x64 {44767840-E79D-4049-B97B-867D32783090}.Release - C++ 03|x64.Build.0 = Release - C++ 03|x64 - {44767840-E79D-4049-B97B-867D32783090}.Release - Clang|Win32.ActiveCfg = Release - C++ 03|Win32 - {44767840-E79D-4049-B97B-867D32783090}.Release - Clang|Win32.Build.0 = Release - C++ 03|Win32 - {44767840-E79D-4049-B97B-867D32783090}.Release - Clang|x64.ActiveCfg = Release - C++ 03|x64 - {44767840-E79D-4049-B97B-867D32783090}.Release - Clang|x64.Build.0 = Release - C++ 03|x64 + {44767840-E79D-4049-B97B-867D32783090}.Release - Clang|Win32.ActiveCfg = Release - Clang|Win32 + {44767840-E79D-4049-B97B-867D32783090}.Release - Clang|Win32.Build.0 = Release - Clang|Win32 + {44767840-E79D-4049-B97B-867D32783090}.Release - Clang|x64.ActiveCfg = Release - Clang|x64 + {44767840-E79D-4049-B97B-867D32783090}.Release - Clang|x64.Build.0 = Release - Clang|x64 {44767840-E79D-4049-B97B-867D32783090}.Release - VS 2013|Win32.ActiveCfg = Release - VS 2013|Win32 {44767840-E79D-4049-B97B-867D32783090}.Release - VS 2013|Win32.Build.0 = Release - VS 2013|Win32 {44767840-E79D-4049-B97B-867D32783090}.Release - VS 2013|x64.ActiveCfg = Release - VS 2013|x64 {44767840-E79D-4049-B97B-867D32783090}.Release - VS 2013|x64.Build.0 = Release - VS 2013|x64 - {44767840-E79D-4049-B97B-867D32783090}.Release|Win32.ActiveCfg = Release|Win32 - {44767840-E79D-4049-B97B-867D32783090}.Release|Win32.Build.0 = Release|Win32 - {44767840-E79D-4049-B97B-867D32783090}.Release|x64.ActiveCfg = Release|x64 - {44767840-E79D-4049-B97B-867D32783090}.Release|x64.Build.0 = Release|x64 + {44767840-E79D-4049-B97B-867D32783090}.Release - VS 2015|Win32.ActiveCfg = Release - VS 2015|Win32 + {44767840-E79D-4049-B97B-867D32783090}.Release - VS 2015|Win32.Build.0 = Release - VS 2015|Win32 + {44767840-E79D-4049-B97B-867D32783090}.Release - VS 2015|x64.ActiveCfg = Release - VS 2015|x64 + {44767840-E79D-4049-B97B-867D32783090}.Release - VS 2015|x64.Build.0 = Release - VS 2015|x64 + {44767840-E79D-4049-B97B-867D32783090}.Release - VS 2017|Win32.ActiveCfg = Release - VS 2017|Win32 + {44767840-E79D-4049-B97B-867D32783090}.Release - VS 2017|Win32.Build.0 = Release - VS 2017|Win32 + {44767840-E79D-4049-B97B-867D32783090}.Release - VS 2017|x64.ActiveCfg = Release - VS 2017|x64 + {44767840-E79D-4049-B97B-867D32783090}.Release - VS 2017|x64.Build.0 = Release - VS 2017|x64 {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - C++ 03|Win32.ActiveCfg = Debug - C++ 03|Win32 {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - C++ 03|Win32.Build.0 = Debug - C++ 03|Win32 {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - C++ 03|x64.ActiveCfg = Debug - C++ 03|x64 {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - C++ 03|x64.Build.0 = Debug - C++ 03|x64 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - Clang|Win32.ActiveCfg = Debug - C++ 03|Win32 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - Clang|Win32.Build.0 = Debug - C++ 03|Win32 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - Clang|x64.ActiveCfg = Debug - C++ 03|x64 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - Clang|x64.Build.0 = Debug - C++ 03|x64 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - Clang|Win32.ActiveCfg = Debug - Clang|Win32 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - Clang|Win32.Build.0 = Debug - Clang|Win32 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - Clang|x64.ActiveCfg = Debug - Clang|x64 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - Clang|x64.Build.0 = Debug - Clang|x64 {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - VS 2013|Win32.ActiveCfg = Debug - VS 2013|Win32 {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - VS 2013|Win32.Build.0 = Debug - VS 2013|Win32 {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - VS 2013|x64.ActiveCfg = Debug - VS 2013|x64 {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - VS 2013|x64.Build.0 = Debug - VS 2013|x64 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug|Win32.ActiveCfg = Debug|Win32 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug|Win32.Build.0 = Debug|Win32 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug|x64.ActiveCfg = Debug|x64 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug|x64.Build.0 = Debug|x64 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - VS 2015|Win32.ActiveCfg = Debug - VS 2015|Win32 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - VS 2015|Win32.Build.0 = Debug - VS 2015|Win32 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - VS 2015|x64.ActiveCfg = Debug - VS 2015|x64 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - VS 2015|x64.Build.0 = Debug - VS 2015|x64 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - VS 2017|Win32.ActiveCfg = Debug - VS 2017|Win32 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - VS 2017|Win32.Build.0 = Debug - VS 2017|Win32 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - VS 2017|x64.ActiveCfg = Debug - VS 2017|x64 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Debug - VS 2017|x64.Build.0 = Debug - VS 2017|x64 {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - C++ 03|Win32.ActiveCfg = Release - C++ 03|Win32 {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - C++ 03|Win32.Build.0 = Release - C++ 03|Win32 {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - C++ 03|x64.ActiveCfg = Release - C++ 03|x64 {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - C++ 03|x64.Build.0 = Release - C++ 03|x64 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - Clang|Win32.ActiveCfg = Release - C++ 03|Win32 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - Clang|Win32.Build.0 = Release - C++ 03|Win32 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - Clang|x64.ActiveCfg = Release - C++ 03|x64 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - Clang|x64.Build.0 = Release - C++ 03|x64 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - Clang|Win32.ActiveCfg = Release - Clang|Win32 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - Clang|Win32.Build.0 = Release - Clang|Win32 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - Clang|x64.ActiveCfg = Release - Clang|x64 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - Clang|x64.Build.0 = Release - Clang|x64 {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - VS 2013|Win32.ActiveCfg = Release - VS 2013|Win32 {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - VS 2013|Win32.Build.0 = Release - VS 2013|Win32 {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - VS 2013|x64.ActiveCfg = Release - VS 2013|x64 {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - VS 2013|x64.Build.0 = Release - VS 2013|x64 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Release|Win32.ActiveCfg = Release|Win32 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Release|Win32.Build.0 = Release|Win32 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Release|x64.ActiveCfg = Release|x64 - {E27E791D-29D2-4FAA-A683-D58228818F67}.Release|x64.Build.0 = Release|x64 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - VS 2015|Win32.ActiveCfg = Release - VS 2015|Win32 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - VS 2015|Win32.Build.0 = Release - VS 2015|Win32 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - VS 2015|x64.ActiveCfg = Release - VS 2015|x64 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - VS 2015|x64.Build.0 = Release - VS 2015|x64 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - VS 2017|Win32.ActiveCfg = Release - VS 2017|Win32 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - VS 2017|Win32.Build.0 = Release - VS 2017|Win32 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - VS 2017|x64.ActiveCfg = Release - VS 2017|x64 + {E27E791D-29D2-4FAA-A683-D58228818F67}.Release - VS 2017|x64.Build.0 = Release - VS 2017|x64 {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - C++ 03|Win32.ActiveCfg = Debug - C++ 03|Win32 {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - C++ 03|Win32.Build.0 = Debug - C++ 03|Win32 {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - C++ 03|x64.ActiveCfg = Debug - C++ 03|x64 {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - C++ 03|x64.Build.0 = Debug - C++ 03|x64 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - Clang|Win32.ActiveCfg = Debug - C++ 03|Win32 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - Clang|Win32.Build.0 = Debug - C++ 03|Win32 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - Clang|x64.ActiveCfg = Debug - C++ 03|x64 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - Clang|x64.Build.0 = Debug - C++ 03|x64 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2013|Win32.ActiveCfg = Debug|Win32 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2013|Win32.Build.0 = Debug|Win32 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2013|x64.ActiveCfg = Debug|x64 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2013|x64.Build.0 = Debug|x64 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug|Win32.ActiveCfg = Debug|Win32 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug|Win32.Build.0 = Debug|Win32 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug|x64.ActiveCfg = Debug|x64 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug|x64.Build.0 = Debug|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - Clang|Win32.ActiveCfg = Debug - Clang|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - Clang|Win32.Build.0 = Debug - Clang|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - Clang|x64.ActiveCfg = Debug - Clang|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - Clang|x64.Build.0 = Debug - Clang|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2013|Win32.ActiveCfg = Debug - VS 2013|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2013|Win32.Build.0 = Debug - VS 2013|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2013|x64.ActiveCfg = Debug - VS 2015|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2013|x64.Build.0 = Debug - VS 2015|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2015|Win32.ActiveCfg = Debug - VS 2015|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2015|Win32.Build.0 = Debug - VS 2015|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2015|x64.ActiveCfg = Debug - VS 2015|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2015|x64.Build.0 = Debug - VS 2015|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2017|Win32.ActiveCfg = Debug - VS 2017|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2017|Win32.Build.0 = Debug - VS 2017|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2017|x64.ActiveCfg = Debug - VS 2017|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Debug - VS 2017|x64.Build.0 = Debug - VS 2017|x64 {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - C++ 03|Win32.ActiveCfg = Release - C++ 03|Win32 {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - C++ 03|Win32.Build.0 = Release - C++ 03|Win32 {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - C++ 03|x64.ActiveCfg = Release - C++ 03|x64 {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - C++ 03|x64.Build.0 = Release - C++ 03|x64 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - Clang|Win32.ActiveCfg = Release - C++ 03|Win32 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - Clang|Win32.Build.0 = Release - C++ 03|Win32 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - Clang|x64.ActiveCfg = Release - C++ 03|x64 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - Clang|x64.Build.0 = Release - C++ 03|x64 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2013|Win32.ActiveCfg = Release|Win32 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2013|Win32.Build.0 = Release|Win32 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2013|x64.ActiveCfg = Release|x64 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2013|x64.Build.0 = Release|x64 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release|Win32.ActiveCfg = Release|Win32 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release|Win32.Build.0 = Release|Win32 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release|x64.ActiveCfg = Release|x64 - {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release|x64.Build.0 = Release|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - Clang|Win32.ActiveCfg = Release - Clang|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - Clang|Win32.Build.0 = Release - Clang|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - Clang|x64.ActiveCfg = Release - Clang|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - Clang|x64.Build.0 = Release - Clang|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2013|Win32.ActiveCfg = Release - VS 2013|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2013|Win32.Build.0 = Release - VS 2013|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2013|x64.ActiveCfg = Release - VS 2015|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2013|x64.Build.0 = Release - VS 2015|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2015|Win32.ActiveCfg = Release - VS 2015|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2015|Win32.Build.0 = Release - VS 2015|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2015|x64.ActiveCfg = Release - VS 2015|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2015|x64.Build.0 = Release - VS 2015|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2017|Win32.ActiveCfg = Release - VS 2017|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2017|Win32.Build.0 = Release - VS 2017|Win32 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2017|x64.ActiveCfg = Release - VS 2017|x64 + {B9D2ABFB-6CD3-4C8F-ACC3-5BE2D798552E}.Release - VS 2017|x64.Build.0 = Release - VS 2017|x64 {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug - C++ 03|Win32.ActiveCfg = Debug - C++ 03|Win32 {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug - C++ 03|Win32.Build.0 = Debug - C++ 03|Win32 {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug - C++ 03|x64.ActiveCfg = Debug - C++ 03|x64 @@ -370,186 +429,230 @@ Global {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug - VS 2013|Win32.Build.0 = Debug - VS 2013|Win32 {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug - VS 2013|x64.ActiveCfg = Debug - VS 2013|x64 {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug - VS 2013|x64.Build.0 = Debug - VS 2013|x64 - {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug|Win32.ActiveCfg = Debug|Win32 - {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug|Win32.Build.0 = Debug|Win32 - {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug|x64.ActiveCfg = Debug|x64 - {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug|x64.Build.0 = Debug|x64 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug - VS 2015|Win32.ActiveCfg = Debug - VS 2015|Win32 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug - VS 2015|Win32.Build.0 = Debug - VS 2015|Win32 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug - VS 2015|x64.ActiveCfg = Debug - VS 2015|x64 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug - VS 2015|x64.Build.0 = Debug - VS 2015|x64 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug - VS 2017|Win32.ActiveCfg = Debug - VS 2017|Win32 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug - VS 2017|Win32.Build.0 = Debug - VS 2017|Win32 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug - VS 2017|x64.ActiveCfg = Debug - VS 2017|x64 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Debug - VS 2017|x64.Build.0 = Debug - VS 2017|x64 {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - C++ 03|Win32.ActiveCfg = Release - C++ 03|Win32 {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - C++ 03|Win32.Build.0 = Release - C++ 03|Win32 {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - C++ 03|x64.ActiveCfg = Release - C++ 03|x64 {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - C++ 03|x64.Build.0 = Release - C++ 03|x64 - {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - Clang|Win32.ActiveCfg = Release - C++ 03|Win32 - {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - Clang|Win32.Build.0 = Release - C++ 03|Win32 - {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - Clang|x64.ActiveCfg = Release - C++ 03|x64 - {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - Clang|x64.Build.0 = Release - C++ 03|x64 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - Clang|Win32.ActiveCfg = Release - Clang|Win32 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - Clang|Win32.Build.0 = Release - Clang|Win32 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - Clang|x64.ActiveCfg = Release - Clang|x64 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - Clang|x64.Build.0 = Release - Clang|x64 {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - VS 2013|Win32.ActiveCfg = Release - VS 2013|Win32 {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - VS 2013|Win32.Build.0 = Release - VS 2013|Win32 {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - VS 2013|x64.ActiveCfg = Release - VS 2013|x64 {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - VS 2013|x64.Build.0 = Release - VS 2013|x64 - {2069AE83-AE26-484A-A6E7-E872E0045020}.Release|Win32.ActiveCfg = Release|Win32 - {2069AE83-AE26-484A-A6E7-E872E0045020}.Release|Win32.Build.0 = Release|Win32 - {2069AE83-AE26-484A-A6E7-E872E0045020}.Release|x64.ActiveCfg = Release|x64 - {2069AE83-AE26-484A-A6E7-E872E0045020}.Release|x64.Build.0 = Release|x64 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - VS 2015|Win32.ActiveCfg = Release - VS 2015|Win32 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - VS 2015|Win32.Build.0 = Release - VS 2015|Win32 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - VS 2015|x64.ActiveCfg = Release - VS 2015|x64 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - VS 2015|x64.Build.0 = Release - VS 2015|x64 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - VS 2017|Win32.ActiveCfg = Release - VS 2017|Win32 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - VS 2017|Win32.Build.0 = Release - VS 2017|Win32 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - VS 2017|x64.ActiveCfg = Release - VS 2017|x64 + {2069AE83-AE26-484A-A6E7-E872E0045020}.Release - VS 2017|x64.Build.0 = Release - VS 2017|x64 {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - C++ 03|Win32.ActiveCfg = Debug - C++ 03|Win32 {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - C++ 03|Win32.Build.0 = Debug - C++ 03|Win32 {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - C++ 03|x64.ActiveCfg = Debug - C++ 03|x64 {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - C++ 03|x64.Build.0 = Debug - C++ 03|x64 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - Clang|Win32.ActiveCfg = Debug|Win32 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - Clang|Win32.Build.0 = Debug|Win32 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - Clang|x64.ActiveCfg = Debug|x64 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - Clang|x64.Build.0 = Debug|x64 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2013|Win32.ActiveCfg = Debug|Win32 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2013|Win32.Build.0 = Debug|Win32 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2013|x64.ActiveCfg = Debug|x64 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2013|x64.Build.0 = Debug|x64 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug|Win32.ActiveCfg = Debug|Win32 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug|Win32.Build.0 = Debug|Win32 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug|x64.ActiveCfg = Debug|x64 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug|x64.Build.0 = Debug|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - Clang|Win32.ActiveCfg = Debug - Clang|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - Clang|Win32.Build.0 = Debug - Clang|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - Clang|x64.ActiveCfg = Debug - Clang|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - Clang|x64.Build.0 = Debug - Clang|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2013|Win32.ActiveCfg = Debug - VS 2013|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2013|Win32.Build.0 = Debug - VS 2013|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2013|x64.ActiveCfg = Debug - VS 2015|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2013|x64.Build.0 = Debug - VS 2015|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2015|Win32.ActiveCfg = Debug - VS 2015|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2015|Win32.Build.0 = Debug - VS 2015|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2015|x64.ActiveCfg = Debug - VS 2015|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2015|x64.Build.0 = Debug - VS 2015|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2017|Win32.ActiveCfg = Debug - VS 2017|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2017|Win32.Build.0 = Debug - VS 2017|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2017|x64.ActiveCfg = Debug - VS 2017|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Debug - VS 2017|x64.Build.0 = Debug - VS 2017|x64 {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - C++ 03|Win32.ActiveCfg = Release - C++ 03|Win32 {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - C++ 03|Win32.Build.0 = Release - C++ 03|Win32 {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - C++ 03|x64.ActiveCfg = Release - C++ 03|x64 {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - C++ 03|x64.Build.0 = Release - C++ 03|x64 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - Clang|Win32.ActiveCfg = Release|Win32 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - Clang|Win32.Build.0 = Release|Win32 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - Clang|x64.ActiveCfg = Release|x64 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - Clang|x64.Build.0 = Release|x64 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2013|Win32.ActiveCfg = Release|Win32 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2013|Win32.Build.0 = Release|Win32 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2013|x64.ActiveCfg = Release|x64 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2013|x64.Build.0 = Release|x64 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release|Win32.ActiveCfg = Release|Win32 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release|Win32.Build.0 = Release|Win32 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release|x64.ActiveCfg = Release|x64 - {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release|x64.Build.0 = Release|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - Clang|Win32.ActiveCfg = Release - Clang|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - Clang|Win32.Build.0 = Release - Clang|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - Clang|x64.ActiveCfg = Release - Clang|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - Clang|x64.Build.0 = Release - Clang|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2013|Win32.ActiveCfg = Release - VS 2013|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2013|Win32.Build.0 = Release - VS 2013|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2013|x64.ActiveCfg = Release - VS 2015|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2013|x64.Build.0 = Release - VS 2015|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2015|Win32.ActiveCfg = Release - VS 2015|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2015|Win32.Build.0 = Release - VS 2015|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2015|x64.ActiveCfg = Release - VS 2015|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2015|x64.Build.0 = Release - VS 2015|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2017|Win32.ActiveCfg = Release - VS 2017|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2017|Win32.Build.0 = Release - VS 2017|Win32 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2017|x64.ActiveCfg = Release - VS 2017|x64 + {466B53F7-FF2E-4A0D-94C1-48E1ACC7D357}.Release - VS 2017|x64.Build.0 = Release - VS 2017|x64 {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - C++ 03|Win32.ActiveCfg = Debug - C++ 03|Win32 {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - C++ 03|Win32.Build.0 = Debug - C++ 03|Win32 {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - C++ 03|x64.ActiveCfg = Debug - C++ 03|x64 {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - C++ 03|x64.Build.0 = Debug - C++ 03|x64 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - Clang|Win32.ActiveCfg = Debug|Win32 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - Clang|Win32.Build.0 = Debug|Win32 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - Clang|x64.ActiveCfg = Debug|x64 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - Clang|x64.Build.0 = Debug|x64 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2013|Win32.ActiveCfg = Debug|Win32 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2013|Win32.Build.0 = Debug|Win32 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2013|x64.ActiveCfg = Debug|x64 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2013|x64.Build.0 = Debug|x64 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug|Win32.ActiveCfg = Debug|Win32 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug|Win32.Build.0 = Debug|Win32 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug|x64.ActiveCfg = Debug|x64 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug|x64.Build.0 = Debug|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - Clang|Win32.ActiveCfg = Debug - Clang|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - Clang|Win32.Build.0 = Debug - Clang|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - Clang|x64.ActiveCfg = Debug - Clang|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - Clang|x64.Build.0 = Debug - Clang|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2013|Win32.ActiveCfg = Debug - VS 2013|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2013|Win32.Build.0 = Debug - VS 2013|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2013|x64.ActiveCfg = Debug - VS 2015|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2013|x64.Build.0 = Debug - VS 2015|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2015|Win32.ActiveCfg = Debug - VS 2015|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2015|Win32.Build.0 = Debug - VS 2015|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2015|x64.ActiveCfg = Debug - VS 2015|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2015|x64.Build.0 = Debug - VS 2015|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2017|Win32.ActiveCfg = Debug - VS 2017|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2017|Win32.Build.0 = Debug - VS 2017|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2017|x64.ActiveCfg = Debug - VS 2017|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Debug - VS 2017|x64.Build.0 = Debug - VS 2017|x64 {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - C++ 03|Win32.ActiveCfg = Release - C++ 03|Win32 {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - C++ 03|Win32.Build.0 = Release - C++ 03|Win32 {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - C++ 03|x64.ActiveCfg = Release - C++ 03|x64 {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - C++ 03|x64.Build.0 = Release - C++ 03|x64 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - Clang|Win32.ActiveCfg = Release|Win32 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - Clang|Win32.Build.0 = Release|Win32 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - Clang|x64.ActiveCfg = Release|x64 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - Clang|x64.Build.0 = Release|x64 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2013|Win32.ActiveCfg = Release|Win32 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2013|Win32.Build.0 = Release|Win32 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2013|x64.ActiveCfg = Release|x64 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2013|x64.Build.0 = Release|x64 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Release|Win32.ActiveCfg = Release|Win32 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Release|Win32.Build.0 = Release|Win32 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Release|x64.ActiveCfg = Release|x64 - {CED23388-105D-46FA-9EC3-AD923C209AED}.Release|x64.Build.0 = Release|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - Clang|Win32.ActiveCfg = Release - Clang|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - Clang|Win32.Build.0 = Release - Clang|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - Clang|x64.ActiveCfg = Release - Clang|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - Clang|x64.Build.0 = Release - Clang|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2013|Win32.ActiveCfg = Release - VS 2013|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2013|Win32.Build.0 = Release - VS 2013|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2013|x64.ActiveCfg = Release - VS 2015|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2013|x64.Build.0 = Release - VS 2015|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2015|Win32.ActiveCfg = Release - VS 2015|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2015|Win32.Build.0 = Release - VS 2015|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2015|x64.ActiveCfg = Release - VS 2015|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2015|x64.Build.0 = Release - VS 2015|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2017|Win32.ActiveCfg = Release - VS 2017|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2017|Win32.Build.0 = Release - VS 2017|Win32 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2017|x64.ActiveCfg = Release - VS 2017|x64 + {CED23388-105D-46FA-9EC3-AD923C209AED}.Release - VS 2017|x64.Build.0 = Release - VS 2017|x64 {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - C++ 03|Win32.ActiveCfg = Debug - C++ 03|Win32 {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - C++ 03|Win32.Build.0 = Debug - C++ 03|Win32 {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - C++ 03|x64.ActiveCfg = Debug - C++ 03|x64 {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - C++ 03|x64.Build.0 = Debug - C++ 03|x64 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - Clang|Win32.ActiveCfg = Debug|Win32 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - Clang|Win32.Build.0 = Debug|Win32 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - Clang|x64.ActiveCfg = Debug|x64 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - Clang|x64.Build.0 = Debug|x64 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2013|Win32.ActiveCfg = Debug|Win32 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2013|Win32.Build.0 = Debug|Win32 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2013|x64.ActiveCfg = Debug|x64 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2013|x64.Build.0 = Debug|x64 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug|Win32.ActiveCfg = Debug|Win32 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug|Win32.Build.0 = Debug|Win32 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug|x64.ActiveCfg = Debug|x64 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug|x64.Build.0 = Debug|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - Clang|Win32.ActiveCfg = Debug - Clang|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - Clang|Win32.Build.0 = Debug - Clang|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - Clang|x64.ActiveCfg = Debug - Clang|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - Clang|x64.Build.0 = Debug - Clang|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2013|Win32.ActiveCfg = Debug - VS 2013|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2013|Win32.Build.0 = Debug - VS 2013|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2013|x64.ActiveCfg = Debug - VS 2015|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2013|x64.Build.0 = Debug - VS 2015|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2015|Win32.ActiveCfg = Debug - VS 2015|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2015|Win32.Build.0 = Debug - VS 2015|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2015|x64.ActiveCfg = Debug - VS 2015|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2015|x64.Build.0 = Debug - VS 2015|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2017|Win32.ActiveCfg = Debug - VS 2017|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2017|Win32.Build.0 = Debug - VS 2017|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2017|x64.ActiveCfg = Debug - VS 2017|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Debug - VS 2017|x64.Build.0 = Debug - VS 2017|x64 {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - C++ 03|Win32.ActiveCfg = Release - C++ 03|Win32 {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - C++ 03|Win32.Build.0 = Release - C++ 03|Win32 {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - C++ 03|x64.ActiveCfg = Release - C++ 03|x64 {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - C++ 03|x64.Build.0 = Release - C++ 03|x64 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - Clang|Win32.ActiveCfg = Release|Win32 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - Clang|Win32.Build.0 = Release|Win32 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - Clang|x64.ActiveCfg = Release|x64 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - Clang|x64.Build.0 = Release|x64 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2013|Win32.ActiveCfg = Release|Win32 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2013|Win32.Build.0 = Release|Win32 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2013|x64.ActiveCfg = Release|x64 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2013|x64.Build.0 = Release|x64 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release|Win32.ActiveCfg = Release|Win32 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release|Win32.Build.0 = Release|Win32 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release|x64.ActiveCfg = Release|x64 - {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release|x64.Build.0 = Release|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - Clang|Win32.ActiveCfg = Release - Clang|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - Clang|Win32.Build.0 = Release - Clang|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - Clang|x64.ActiveCfg = Release - Clang|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - Clang|x64.Build.0 = Release - Clang|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2013|Win32.ActiveCfg = Release - VS 2013|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2013|Win32.Build.0 = Release - VS 2013|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2013|x64.ActiveCfg = Release - VS 2015|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2013|x64.Build.0 = Release - VS 2015|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2015|Win32.ActiveCfg = Release - VS 2015|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2015|Win32.Build.0 = Release - VS 2015|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2015|x64.ActiveCfg = Release - VS 2015|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2015|x64.Build.0 = Release - VS 2015|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2017|Win32.ActiveCfg = Release - VS 2017|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2017|Win32.Build.0 = Release - VS 2017|Win32 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2017|x64.ActiveCfg = Release - VS 2017|x64 + {E70CC0C5-256B-41E2-A852-B1904C2D84D3}.Release - VS 2017|x64.Build.0 = Release - VS 2017|x64 {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - C++ 03|Win32.ActiveCfg = Debug - C++ 03|Win32 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - C++ 03|Win32.Build.0 = Debug - C++ 03|Win32 {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - C++ 03|x64.ActiveCfg = Debug - C++ 03|x64 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - C++ 03|x64.Build.0 = Debug - C++ 03|x64 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - Clang|Win32.ActiveCfg = Debug|Win32 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - Clang|Win32.Build.0 = Debug|Win32 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - Clang|x64.ActiveCfg = Debug|x64 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - Clang|x64.Build.0 = Debug|x64 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - VS 2013|Win32.ActiveCfg = Debug|Win32 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - VS 2013|Win32.Build.0 = Debug|Win32 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - VS 2013|x64.ActiveCfg = Debug|x64 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - VS 2013|x64.Build.0 = Debug|x64 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug|Win32.ActiveCfg = Debug|Win32 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug|Win32.Build.0 = Debug|Win32 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug|x64.ActiveCfg = Debug|x64 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug|x64.Build.0 = Debug|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - Clang|Win32.ActiveCfg = Debug - Clang|Win32 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - Clang|Win32.Build.0 = Debug - Clang|Win32 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - Clang|x64.ActiveCfg = Debug - Clang|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - Clang|x64.Build.0 = Debug - Clang|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - VS 2013|Win32.ActiveCfg = Debug - VS 2015|Win32 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - VS 2013|x64.ActiveCfg = Debug - VS 2015|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - VS 2013|x64.Build.0 = Debug - VS 2015|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - VS 2015|Win32.ActiveCfg = Debug - VS 2015|Win32 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - VS 2015|Win32.Build.0 = Debug - VS 2015|Win32 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - VS 2015|x64.ActiveCfg = Debug - VS 2015|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - VS 2015|x64.Build.0 = Debug - VS 2015|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - VS 2017|Win32.ActiveCfg = Debug - VS 2017|Win32 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - VS 2017|Win32.Build.0 = Debug - VS 2017|Win32 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - VS 2017|x64.ActiveCfg = Debug - VS 2017|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Debug - VS 2017|x64.Build.0 = Debug - VS 2017|x64 {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - C++ 03|Win32.ActiveCfg = Release - C++ 03|Win32 {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - C++ 03|Win32.Build.0 = Release - C++ 03|Win32 {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - C++ 03|x64.ActiveCfg = Release - C++ 03|x64 {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - C++ 03|x64.Build.0 = Release - C++ 03|x64 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - Clang|Win32.ActiveCfg = Release|Win32 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - Clang|Win32.Build.0 = Release|Win32 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - Clang|x64.ActiveCfg = Release|x64 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - Clang|x64.Build.0 = Release|x64 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - VS 2013|Win32.ActiveCfg = Release|Win32 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - VS 2013|Win32.Build.0 = Release|Win32 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - VS 2013|x64.ActiveCfg = Release|x64 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - VS 2013|x64.Build.0 = Release|x64 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release|Win32.ActiveCfg = Release|Win32 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release|Win32.Build.0 = Release|Win32 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release|x64.ActiveCfg = Release|x64 - {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release|x64.Build.0 = Release|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug - C++ 03|Win32.ActiveCfg = Debug - C++ 03|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug - C++ 03|Win32.Build.0 = Debug - C++ 03|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug - C++ 03|x64.ActiveCfg = Debug - C++ 03|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug - C++ 03|x64.Build.0 = Debug - C++ 03|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug - Clang|Win32.ActiveCfg = Debug - C++ 03|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug - Clang|Win32.Build.0 = Debug - C++ 03|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug - Clang|x64.ActiveCfg = Debug - C++ 03|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug - Clang|x64.Build.0 = Debug - C++ 03|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug - VS 2013|Win32.ActiveCfg = Debug - VS 2013|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug - VS 2013|Win32.Build.0 = Debug - VS 2013|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug - VS 2013|x64.ActiveCfg = Debug - VS 2013|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug - VS 2013|x64.Build.0 = Debug - VS 2013|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug|Win32.ActiveCfg = Debug|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug|Win32.Build.0 = Debug|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug|x64.ActiveCfg = Debug|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Debug|x64.Build.0 = Debug|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release - C++ 03|Win32.ActiveCfg = Release - C++ 03|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release - C++ 03|Win32.Build.0 = Release - C++ 03|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release - C++ 03|x64.ActiveCfg = Release - C++ 03|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release - C++ 03|x64.Build.0 = Release - C++ 03|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release - Clang|Win32.ActiveCfg = Release - C++ 03|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release - Clang|Win32.Build.0 = Release - C++ 03|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release - Clang|x64.ActiveCfg = Release - C++ 03|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release - Clang|x64.Build.0 = Release - C++ 03|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release - VS 2013|Win32.ActiveCfg = Release - VS 2013|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release - VS 2013|Win32.Build.0 = Release - VS 2013|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release - VS 2013|x64.ActiveCfg = Release - VS 2013|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release - VS 2013|x64.Build.0 = Release - VS 2013|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release|Win32.ActiveCfg = Release|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release|Win32.Build.0 = Release|Win32 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release|x64.ActiveCfg = Release|x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57}.Release|x64.Build.0 = Release|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - Clang|Win32.ActiveCfg = Release - Clang|Win32 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - Clang|Win32.Build.0 = Release - Clang|Win32 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - Clang|x64.ActiveCfg = Release - Clang|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - Clang|x64.Build.0 = Release - Clang|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - VS 2013|Win32.ActiveCfg = Release - VS 2015|Win32 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - VS 2013|x64.ActiveCfg = Release - VS 2015|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - VS 2013|x64.Build.0 = Release - VS 2015|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - VS 2015|Win32.ActiveCfg = Release - VS 2015|Win32 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - VS 2015|Win32.Build.0 = Release - VS 2015|Win32 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - VS 2015|x64.ActiveCfg = Release - VS 2015|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - VS 2015|x64.Build.0 = Release - VS 2015|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - VS 2017|Win32.ActiveCfg = Release - VS 2017|Win32 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - VS 2017|Win32.Build.0 = Release - VS 2017|Win32 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - VS 2017|x64.ActiveCfg = Release - VS 2017|x64 + {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68}.Release - VS 2017|x64.Build.0 = Release - VS 2017|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - C++ 03|Win32.ActiveCfg = Debug - C++ 03|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - C++ 03|Win32.Build.0 = Debug - C++ 03|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - C++ 03|x64.ActiveCfg = Debug - C++ 03|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - C++ 03|x64.Build.0 = Debug - C++ 03|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - Clang|Win32.ActiveCfg = Debug - Clang|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - Clang|Win32.Build.0 = Debug - Clang|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - Clang|x64.ActiveCfg = Debug - Clang|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - Clang|x64.Build.0 = Debug - Clang|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - VS 2013|Win32.ActiveCfg = Debug - VS 2013|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - VS 2013|Win32.Build.0 = Debug - VS 2013|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - VS 2013|x64.ActiveCfg = Debug - VS 2013|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - VS 2013|x64.Build.0 = Debug - VS 2013|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - VS 2015|Win32.ActiveCfg = Debug - VS 2015|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - VS 2015|Win32.Build.0 = Debug - VS 2015|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - VS 2015|x64.ActiveCfg = Debug - VS 2015|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - VS 2015|x64.Build.0 = Debug - VS 2015|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - VS 2017|Win32.ActiveCfg = Debug - VS 2017|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - VS 2017|Win32.Build.0 = Debug - VS 2017|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - VS 2017|x64.ActiveCfg = Debug - VS 2017|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Debug - VS 2017|x64.Build.0 = Debug - VS 2017|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - C++ 03|Win32.ActiveCfg = Release - C++ 03|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - C++ 03|Win32.Build.0 = Release - C++ 03|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - C++ 03|x64.ActiveCfg = Release - C++ 03|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - C++ 03|x64.Build.0 = Release - C++ 03|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - Clang|Win32.ActiveCfg = Release - Clang|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - Clang|Win32.Build.0 = Release - Clang|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - Clang|x64.ActiveCfg = Release - Clang|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - Clang|x64.Build.0 = Release - Clang|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - VS 2013|Win32.ActiveCfg = Release - VS 2013|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - VS 2013|Win32.Build.0 = Release - VS 2013|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - VS 2013|x64.ActiveCfg = Release - VS 2013|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - VS 2013|x64.Build.0 = Release - VS 2013|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - VS 2015|Win32.ActiveCfg = Release - VS 2015|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - VS 2015|Win32.Build.0 = Release - VS 2015|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - VS 2015|x64.ActiveCfg = Release - VS 2015|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - VS 2015|x64.Build.0 = Release - VS 2015|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - VS 2017|Win32.ActiveCfg = Release - VS 2017|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - VS 2017|Win32.Build.0 = Release - VS 2017|Win32 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - VS 2017|x64.ActiveCfg = Release - VS 2017|x64 + {AE8A7631-2145-4356-B430-FD40416B9523}.Release - VS 2017|x64.Build.0 = Release - VS 2017|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -573,6 +676,9 @@ Global {B883C29E-485C-4C8F-ACB1-A1602378BF5C} = {AF9A9587-13D2-4D16-9C3A-AB3061E3FEF3} {CA16ABEE-C6DE-4BD4-9DE4-5C2F1D149A68} = {B883C29E-485C-4C8F-ACB1-A1602378BF5C} {A23DCF32-F7CB-450B-B4A0-59AD7BACFDD4} = {FBC833F8-033B-4400-8CBA-C71A32CF62B4} - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57} = {B7DF480E-DC38-410F-86E7-330696F7D5AB} + {AE8A7631-2145-4356-B430-FD40416B9523} = {B7DF480E-DC38-410F-86E7-330696F7D5AB} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {08130CC8-A1F0-4919-A481-F79DED03E207} EndGlobalSection EndGlobal From 602f293db15710d37e8e22641c4d7ee575ca7f21 Mon Sep 17 00:00:00 2001 From: Tibor Molnar Date: Thu, 21 Sep 2017 13:33:22 +0200 Subject: [PATCH 2/9] yasmine 1.4.0 --- .../classic_farmroad/classic_farmroad.vcxproj | 371 ++++++++++++- .../event_collector_example.vcxproj | 500 +++++++++++++++++- .../events_with_parameters.vcxproj | 374 ++++++++++++- examples/forty_two/forty_two.vcxproj | 359 ++++++++++++- .../generator_example.vcxproj | 369 ++++++++++++- examples/hello_yasmine/hello_yasmine.vcxproj | 374 ++++++++++++- .../substatemachines_and_variables.vcxproj | 371 ++++++++++++- .../unhandled_event_handler_example.vcxproj | 376 ++++++++++++- 8 files changed, 3020 insertions(+), 74 deletions(-) diff --git a/examples/classic_farmroad/classic_farmroad.vcxproj b/examples/classic_farmroad/classic_farmroad.vcxproj index d781e92..b4ce189 100644 --- a/examples/classic_farmroad/classic_farmroad.vcxproj +++ b/examples/classic_farmroad/classic_farmroad.vcxproj @@ -1,5 +1,5 @@  - + Debug - C++ 03 @@ -9,6 +9,14 @@ Debug - C++ 03 x64 + + Debug - Clang + Win32 + + + Debug - Clang + x64 + Debug - VS 2013 Win32 @@ -17,10 +25,22 @@ Debug - VS 2013 x64 - - Debug + + Debug - VS 2015 Win32 + + Debug - VS 2015 + x64 + + + Debug - VS 2017 + Win32 + + + Debug - VS 2017 + x64 + Release - C++ 03 Win32 @@ -29,6 +49,14 @@ Release - C++ 03 x64 + + Release - Clang + Win32 + + + Release - Clang + x64 + Release - VS 2013 Win32 @@ -37,16 +65,20 @@ Release - VS 2013 x64 - - Release + + Release - VS 2015 Win32 - - Debug + + Release - VS 2015 x64 - - Release + + Release - VS 2017 + Win32 + + + Release - VS 2017 x64 @@ -57,11 +89,29 @@ + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v141 + MultiByte + Application true @@ -75,12 +125,33 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v141 + true + MultiByte + Application false @@ -96,11 +167,29 @@ MultiByte + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v141 + MultiByte + Application true @@ -114,12 +203,33 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v141 + true + MultiByte + Application false @@ -147,13 +257,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -172,12 +311,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -196,13 +361,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -221,10 +415,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -245,6 +463,24 @@ true + + + Disabled + true + + + + + Disabled + true + + + + + Disabled + true + + Level3 @@ -269,6 +505,36 @@ MachineX64 + + + Level3 + Disabled + true + + + MachineX64 + + + + + Level3 + Disabled + true + + + MachineX64 + + + + + Level3 + Disabled + true + + + MachineX64 + + Level3 @@ -303,6 +569,48 @@ true + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + Level3 @@ -344,6 +652,51 @@ true + + + Level3 + MaxSpeed + true + true + true + + + true + true + MachineX64 + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + MachineX64 + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + MachineX64 + true + + Level3 diff --git a/examples/event_collector_example/event_collector_example.vcxproj b/examples/event_collector_example/event_collector_example.vcxproj index 85dfa83..4b4a2ca 100644 --- a/examples/event_collector_example/event_collector_example.vcxproj +++ b/examples/event_collector_example/event_collector_example.vcxproj @@ -1,5 +1,5 @@  - + Debug - C++ 03 @@ -9,10 +9,38 @@ Debug - C++ 03 x64 - - Debug + + Debug - Clang Win32 + + Debug - Clang + x64 + + + Debug - VS 2013 + Win32 + + + Debug - VS 2013 + x64 + + + Debug - VS 2015 + Win32 + + + Debug - VS 2015 + x64 + + + Debug - VS 2017 + Win32 + + + Debug - VS 2017 + x64 + Release - C++ 03 Win32 @@ -21,16 +49,36 @@ Release - C++ 03 x64 - - Release + + Release - Clang + Win32 + + + Release - Clang + x64 + + + Release - VS 2013 + Win32 + + + Release - VS 2013 + x64 + + + Release - VS 2015 Win32 - - Debug + + Release - VS 2015 x64 - - Release + + Release - VS 2017 + Win32 + + + Release - VS 2017 x64 @@ -41,11 +89,35 @@ + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v120 + MultiByte + + + Application + true + v141 + MultiByte + Application true @@ -53,12 +125,40 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v120 + true + MultiByte + + + Application + false + v141 + true + MultiByte + Application false @@ -67,11 +167,35 @@ MultiByte + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v120 + MultiByte + + + Application + true + v141 + MultiByte + Application true @@ -79,16 +203,44 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v120 + true + MultiByte + + + Application + false + v141 + true + MultiByte + Application false - v110 + v120 true MultiByte @@ -105,6 +257,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -122,6 +309,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -139,6 +357,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -156,6 +409,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -177,6 +461,46 @@ true + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + Level3 @@ -197,6 +521,46 @@ true + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + Level3 @@ -221,6 +585,62 @@ true + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + Level3 @@ -250,6 +670,66 @@ MachineX64 + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + Level3 diff --git a/examples/events_with_parameters/events_with_parameters.vcxproj b/examples/events_with_parameters/events_with_parameters.vcxproj index dc08c2e..cb20d52 100644 --- a/examples/events_with_parameters/events_with_parameters.vcxproj +++ b/examples/events_with_parameters/events_with_parameters.vcxproj @@ -1,5 +1,5 @@  - + Debug - C++ 03 @@ -9,6 +9,14 @@ Debug - C++ 03 x64 + + Debug - Clang + Win32 + + + Debug - Clang + x64 + Debug - VS 2013 Win32 @@ -17,10 +25,22 @@ Debug - VS 2013 x64 - - Debug + + Debug - VS 2015 Win32 + + Debug - VS 2015 + x64 + + + Debug - VS 2017 + Win32 + + + Debug - VS 2017 + x64 + Release - C++ 03 Win32 @@ -29,6 +49,14 @@ Release - C++ 03 x64 + + Release - Clang + Win32 + + + Release - Clang + x64 + Release - VS 2013 Win32 @@ -37,16 +65,20 @@ Release - VS 2013 x64 - - Release + + Release - VS 2015 Win32 - - Debug + + Release - VS 2015 x64 - - Release + + Release - VS 2017 + Win32 + + + Release - VS 2017 x64 @@ -81,11 +113,29 @@ + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v141 + MultiByte + Application true @@ -99,12 +149,33 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v141 + true + MultiByte + Application false @@ -120,11 +191,29 @@ MultiByte + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v141 + MultiByte + Application true @@ -138,12 +227,33 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v141 + true + MultiByte + Application false @@ -171,10 +281,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -196,10 +333,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -220,10 +381,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -245,10 +433,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -272,6 +484,33 @@ true + + + Disabled + true + + + true + + + + + Disabled + true + + + true + + + + + Disabled + true + + + true + + Level3 @@ -303,6 +542,39 @@ MachineX64 + + + Level3 + Disabled + true + + + true + MachineX64 + + + + + Level3 + Disabled + true + + + true + MachineX64 + + + + + Level3 + Disabled + true + + + true + MachineX64 + + Level3 @@ -338,6 +610,45 @@ true + + + MaxSpeed + true + true + true + + + true + true + true + + + + + MaxSpeed + true + true + true + + + true + true + true + + + + + MaxSpeed + true + true + true + + + true + true + true + + Level3 @@ -381,6 +692,51 @@ MachineX64 + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + Level3 diff --git a/examples/forty_two/forty_two.vcxproj b/examples/forty_two/forty_two.vcxproj index ba2f703..ad3ab8f 100644 --- a/examples/forty_two/forty_two.vcxproj +++ b/examples/forty_two/forty_two.vcxproj @@ -1,5 +1,5 @@  - + Debug - C++ 03 @@ -9,6 +9,14 @@ Debug - C++ 03 x64 + + Debug - Clang + Win32 + + + Debug - Clang + x64 + Debug - VS 2013 Win32 @@ -17,10 +25,22 @@ Debug - VS 2013 x64 - - Debug + + Debug - VS 2015 Win32 + + Debug - VS 2015 + x64 + + + Debug - VS 2017 + Win32 + + + Debug - VS 2017 + x64 + Release - C++ 03 Win32 @@ -29,6 +49,14 @@ Release - C++ 03 x64 + + Release - Clang + Win32 + + + Release - Clang + x64 + Release - VS 2013 Win32 @@ -37,16 +65,20 @@ Release - VS 2013 x64 - - Release + + Release - VS 2015 Win32 - - Debug + + Release - VS 2015 x64 - - Release + + Release - VS 2017 + Win32 + + + Release - VS 2017 x64 @@ -57,11 +89,29 @@ + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v141 + MultiByte + Application true @@ -75,12 +125,33 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v141 + true + MultiByte + Application false @@ -96,11 +167,29 @@ MultiByte + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v141 + MultiByte + Application true @@ -114,12 +203,33 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v141 + true + MultiByte + Application false @@ -147,10 +257,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -172,10 +309,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -196,10 +357,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -221,10 +409,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -246,6 +458,27 @@ true + + + Level3 + Disabled + true + + + + + Level3 + Disabled + true + + + + + Level3 + Disabled + true + + Level3 @@ -276,6 +509,36 @@ MachineX64 + + + Level3 + Disabled + true + + + MachineX64 + + + + + Level3 + Disabled + true + + + MachineX64 + + + + + Level3 + Disabled + true + + + MachineX64 + + Level3 @@ -308,6 +571,42 @@ true + + + MaxSpeed + true + true + true + + + true + true + + + + + MaxSpeed + true + true + true + + + true + true + + + + + MaxSpeed + true + true + true + + + true + true + + Level3 @@ -348,6 +647,48 @@ MachineX64 + + + Level3 + MaxSpeed + true + true + true + + + true + true + MachineX64 + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + MachineX64 + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + MachineX64 + + Level3 diff --git a/examples/generator_example/generator_example.vcxproj b/examples/generator_example/generator_example.vcxproj index 5f2530a..82000d4 100644 --- a/examples/generator_example/generator_example.vcxproj +++ b/examples/generator_example/generator_example.vcxproj @@ -1,5 +1,5 @@  - + Debug - C++ 03 @@ -9,10 +9,30 @@ Debug - C++ 03 x64 - - Debug + + Debug - Clang Win32 + + Debug - Clang + x64 + + + Debug - VS 2015 + Win32 + + + Debug - VS 2015 + x64 + + + Debug - VS 2017 + Win32 + + + Debug - VS 2017 + x64 + Release - C++ 03 Win32 @@ -21,16 +41,28 @@ Release - C++ 03 x64 - - Release + + Release - Clang Win32 - - Debug + + Release - Clang x64 - - Release + + Release - VS 2015 + Win32 + + + Release - VS 2015 + x64 + + + Release - VS 2017 + Win32 + + + Release - VS 2017 x64 @@ -41,11 +73,29 @@ + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v141 + MultiByte + Application true @@ -53,12 +103,33 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v141 + true + MultiByte + Application false @@ -67,11 +138,29 @@ MultiByte + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v141 + MultiByte + Application true @@ -79,12 +168,33 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v141 + true + MultiByte + Application false @@ -105,6 +215,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -122,6 +257,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -139,6 +296,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -156,6 +338,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -177,6 +381,36 @@ true + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + Level3 @@ -197,6 +431,36 @@ true + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + Level3 @@ -221,6 +485,48 @@ true + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + Level3 @@ -250,6 +556,51 @@ MachineX64 + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + Level3 diff --git a/examples/hello_yasmine/hello_yasmine.vcxproj b/examples/hello_yasmine/hello_yasmine.vcxproj index 72d2a0e..ea2bd49 100644 --- a/examples/hello_yasmine/hello_yasmine.vcxproj +++ b/examples/hello_yasmine/hello_yasmine.vcxproj @@ -1,5 +1,5 @@  - + Debug - C++ 03 @@ -9,6 +9,14 @@ Debug - C++ 03 x64 + + Debug - Clang + Win32 + + + Debug - Clang + x64 + Debug - VS 2013 Win32 @@ -17,10 +25,22 @@ Debug - VS 2013 x64 - - Debug + + Debug - VS 2015 Win32 + + Debug - VS 2015 + x64 + + + Debug - VS 2017 + Win32 + + + Debug - VS 2017 + x64 + Release - C++ 03 Win32 @@ -29,6 +49,14 @@ Release - C++ 03 x64 + + Release - Clang + Win32 + + + Release - Clang + x64 + Release - VS 2013 Win32 @@ -37,16 +65,20 @@ Release - VS 2013 x64 - - Release + + Release - VS 2015 Win32 - - Debug + + Release - VS 2015 x64 - - Release + + Release - VS 2017 + Win32 + + + Release - VS 2017 x64 @@ -57,11 +89,29 @@ + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v141 + MultiByte + Application true @@ -75,12 +125,33 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v141 + true + MultiByte + Application false @@ -96,11 +167,29 @@ MultiByte + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v141 + MultiByte + Application true @@ -114,12 +203,33 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v141 + true + MultiByte + Application false @@ -147,10 +257,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -172,10 +309,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -196,10 +357,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -221,10 +409,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -247,6 +459,33 @@ MachineX86 + + + Disabled + true + + + MachineX86 + + + + + Disabled + true + + + MachineX86 + + + + + Disabled + true + + + MachineX86 + + Level3 @@ -273,6 +512,42 @@ MachineX64 + + + Level3 + Disabled + true + + + + + MachineX64 + + + + + Level3 + Disabled + true + + + + + MachineX64 + + + + + Level3 + Disabled + true + + + + + MachineX64 + + Level3 @@ -305,6 +580,42 @@ true + + + MaxSpeed + true + true + true + + + true + true + + + + + MaxSpeed + true + true + true + + + true + true + + + + + MaxSpeed + true + true + true + + + true + true + + Level3 @@ -346,6 +657,51 @@ No + + + Level3 + MaxSpeed + true + true + true + + + true + true + MachineX64 + No + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + MachineX64 + No + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + MachineX64 + No + + Level3 diff --git a/examples/substatemachines_and_variables/substatemachines_and_variables.vcxproj b/examples/substatemachines_and_variables/substatemachines_and_variables.vcxproj index 837b1e7..e07a96c 100644 --- a/examples/substatemachines_and_variables/substatemachines_and_variables.vcxproj +++ b/examples/substatemachines_and_variables/substatemachines_and_variables.vcxproj @@ -1,5 +1,5 @@  - + Debug - C++ 03 @@ -9,6 +9,14 @@ Debug - C++ 03 x64 + + Debug - Clang + Win32 + + + Debug - Clang + x64 + Debug - VS 2013 Win32 @@ -17,10 +25,22 @@ Debug - VS 2013 x64 - - Debug + + Debug - VS 2015 Win32 + + Debug - VS 2015 + x64 + + + Debug - VS 2017 + Win32 + + + Debug - VS 2017 + x64 + Release - C++ 03 Win32 @@ -29,6 +49,14 @@ Release - C++ 03 x64 + + Release - Clang + Win32 + + + Release - Clang + x64 + Release - VS 2013 Win32 @@ -37,16 +65,20 @@ Release - VS 2013 x64 - - Release + + Release - VS 2015 Win32 - - Debug + + Release - VS 2015 x64 - - Release + + Release - VS 2017 + Win32 + + + Release - VS 2017 x64 @@ -57,11 +89,29 @@ + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v141 + MultiByte + Application true @@ -75,12 +125,33 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v141 + true + MultiByte + Application false @@ -96,11 +167,29 @@ MultiByte + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v141 + MultiByte + Application true @@ -114,12 +203,33 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v141 + true + MultiByte + Application false @@ -147,10 +257,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -172,10 +309,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -196,10 +357,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -221,10 +409,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -248,6 +460,33 @@ true + + + Disabled + true + + + true + + + + + Disabled + true + + + true + + + + + Disabled + true + + + true + + Level3 @@ -278,6 +517,36 @@ true + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + Level3 @@ -311,6 +580,45 @@ true + + + MaxSpeed + true + true + true + + + true + true + true + + + + + MaxSpeed + true + true + true + + + true + true + true + + + + + MaxSpeed + true + true + true + + + true + true + true + + Level3 @@ -354,6 +662,51 @@ MachineX64 + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + Level3 diff --git a/examples/unhandled_event_handler_example/unhandled_event_handler_example.vcxproj b/examples/unhandled_event_handler_example/unhandled_event_handler_example.vcxproj index cb8d61d..95caa37 100644 --- a/examples/unhandled_event_handler_example/unhandled_event_handler_example.vcxproj +++ b/examples/unhandled_event_handler_example/unhandled_event_handler_example.vcxproj @@ -1,5 +1,5 @@  - + Debug - C++ 03 @@ -9,6 +9,14 @@ Debug - C++ 03 x64 + + Debug - Clang + Win32 + + + Debug - Clang + x64 + Debug - VS 2013 Win32 @@ -17,10 +25,22 @@ Debug - VS 2013 x64 - - Debug + + Debug - VS 2015 Win32 + + Debug - VS 2015 + x64 + + + Debug - VS 2017 + Win32 + + + Debug - VS 2017 + x64 + Release - C++ 03 Win32 @@ -29,6 +49,14 @@ Release - C++ 03 x64 + + Release - Clang + Win32 + + + Release - Clang + x64 + Release - VS 2013 Win32 @@ -37,31 +65,53 @@ Release - VS 2013 x64 - - Release + + Release - VS 2015 Win32 - - Debug + + Release - VS 2015 x64 - - Release + + Release - VS 2017 + Win32 + + + Release - VS 2017 x64 - {E8D45BE5-04E2-4AC7-A226-1DDC4B492A57} + {AE8A7631-2145-4356-B430-FD40416B9523} unhandled_event_handler_example 8.1 + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v141 + MultiByte + Application true @@ -75,12 +125,33 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v141 + true + MultiByte + Application false @@ -96,11 +167,29 @@ MultiByte + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v141 + MultiByte + Application true @@ -114,12 +203,33 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v141 + true + MultiByte + Application false @@ -147,10 +257,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -172,10 +309,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -196,10 +357,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -221,10 +409,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -247,6 +459,33 @@ MachineX86 + + + Disabled + true + + + MachineX86 + + + + + Disabled + true + + + MachineX86 + + + + + Disabled + true + + + MachineX86 + + Level3 @@ -273,6 +512,42 @@ MachineX64 + + + Level3 + Disabled + true + + + + + MachineX64 + + + + + Level3 + Disabled + true + + + + + MachineX64 + + + + + Level3 + Disabled + true + + + + + MachineX64 + + Level3 @@ -305,6 +580,42 @@ true + + + MaxSpeed + true + true + true + + + true + true + + + + + MaxSpeed + true + true + true + + + true + true + + + + + MaxSpeed + true + true + true + + + true + true + + Level3 @@ -346,6 +657,51 @@ No + + + Level3 + MaxSpeed + true + true + true + + + true + true + MachineX64 + No + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + MachineX64 + No + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + MachineX64 + No + + Level3 From 015ed513b48151d00f093509e1cf2b9ee0aacd40 Mon Sep 17 00:00:00 2001 From: Tibor Molnar Date: Thu, 21 Sep 2017 13:35:38 +0200 Subject: [PATCH 3/9] yasmine 1.4.0 --- genesis/changelog.txt | 10 + genesis/genesis.vcxproj | 462 +++++++++++++++++++- genesis/include/template_block.hpp | 2 +- libygen/include/libygen_build_number.hpp | 2 +- libygen/libygen.vcxproj | 522 ++++++++++++++++++++++- ygen/changelog.txt | 8 + ygen/include/ygen_build_number.hpp | 2 +- ygen/source/ygen_version.cpp | 2 +- ygen/templates/header.gtpl | 3 +- ygen/templates/source.gtpl | 1 - ygen/ygen.vcxproj | 516 +++++++++++++++++++++- 11 files changed, 1494 insertions(+), 36 deletions(-) diff --git a/genesis/changelog.txt b/genesis/changelog.txt index 3f69df8..e46c774 100644 --- a/genesis/changelog.txt +++ b/genesis/changelog.txt @@ -1,6 +1,16 @@ # Change log All notable changes to this project are documented in this file. + +##[0.3.0] - 2017-09-21 + +### Added +• Support for Visual Studio 2017 builds + +### Fixed +• added missing override specifier to template_block::create method + + ##[0.2.0] - 2017-04-24 ### Added diff --git a/genesis/genesis.vcxproj b/genesis/genesis.vcxproj index 53f93bc..4dfd736 100644 --- a/genesis/genesis.vcxproj +++ b/genesis/genesis.vcxproj @@ -1,5 +1,5 @@  - + Debug - C++ 03 @@ -9,10 +9,38 @@ Debug - C++ 03 x64 - - Debug + + Debug - Clang Win32 + + Debug - Clang + x64 + + + Debug - VS 2013 + Win32 + + + Debug - VS 2013 + x64 + + + Debug - VS 2015 + Win32 + + + Debug - VS 2015 + x64 + + + Debug - VS 2017 + Win32 + + + Debug - VS 2017 + x64 + Release - C++ 03 Win32 @@ -21,16 +49,36 @@ Release - C++ 03 x64 - - Release + + Release - Clang + Win32 + + + Release - Clang + x64 + + + Release - VS 2013 + Win32 + + + Release - VS 2013 + x64 + + + Release - VS 2015 Win32 - - Debug + + Release - VS 2015 x64 - - Release + + Release - VS 2017 + Win32 + + + Release - VS 2017 x64 @@ -41,11 +89,35 @@ + StaticLibrary + true + v141 + MultiByte + + + StaticLibrary + true + v141_clang_c2 + MultiByte + + StaticLibrary true v140 MultiByte + + StaticLibrary + true + v120 + MultiByte + + + StaticLibrary + true + v141 + MultiByte + StaticLibrary true @@ -53,12 +125,40 @@ MultiByte + StaticLibrary + false + v141 + true + MultiByte + + + StaticLibrary + false + v141_clang_c2 + true + MultiByte + + StaticLibrary false v140 true MultiByte + + StaticLibrary + false + v120 + true + MultiByte + + + StaticLibrary + false + v141 + true + MultiByte + StaticLibrary false @@ -67,11 +167,35 @@ MultiByte + StaticLibrary + true + v141 + MultiByte + + + StaticLibrary + true + v141_clang_c2 + MultiByte + + StaticLibrary true v140 MultiByte + + StaticLibrary + true + v120 + MultiByte + + + StaticLibrary + true + v141 + MultiByte + StaticLibrary true @@ -79,12 +203,40 @@ MultiByte + StaticLibrary + false + v141 + true + MultiByte + + + StaticLibrary + false + v141_clang_c2 + true + MultiByte + + StaticLibrary false v140 true MultiByte + + StaticLibrary + false + v120 + true + MultiByte + + + StaticLibrary + false + v141 + true + MultiByte + StaticLibrary false @@ -103,6 +255,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -114,6 +293,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -125,6 +327,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -136,6 +365,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -153,6 +405,46 @@ true + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + Level3 @@ -173,6 +465,46 @@ true + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + Level3 @@ -197,6 +529,62 @@ true + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + Level3 @@ -225,6 +613,62 @@ true + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + Level3 diff --git a/genesis/include/template_block.hpp b/genesis/include/template_block.hpp index 7544977..c284590 100644 --- a/genesis/include/template_block.hpp +++ b/genesis/include/template_block.hpp @@ -46,7 +46,7 @@ class template_block //!\brief Create the output for a step. //!\param _recipe_callback Generator callback //!\param _ostream Stream to which the generator writes. - void create( recipe_callback& _recipe_callback, std::stringstream& _ostream ); + virtual void create( recipe_callback& _recipe_callback, std::stringstream& _ostream ) SX_OVERRIDE; private: diff --git a/libygen/include/libygen_build_number.hpp b/libygen/include/libygen_build_number.hpp index 7de1b3e..dacd405 100644 --- a/libygen/include/libygen_build_number.hpp +++ b/libygen/include/libygen_build_number.hpp @@ -24,7 +24,7 @@ namespace version { - const sxe::uint16_t BUILD_NUMBER( 722 ); + const sxe::uint16_t BUILD_NUMBER( 751 ); } diff --git a/libygen/libygen.vcxproj b/libygen/libygen.vcxproj index 9291918..fc3c283 100644 --- a/libygen/libygen.vcxproj +++ b/libygen/libygen.vcxproj @@ -1,5 +1,5 @@  - + Debug - C++ 03 @@ -9,10 +9,38 @@ Debug - C++ 03 x64 - - Debug + + Debug - Clang Win32 + + Debug - Clang + x64 + + + Debug - VS 2013 + Win32 + + + Debug - VS 2013 + x64 + + + Debug - VS 2015 + Win32 + + + Debug - VS 2015 + x64 + + + Debug - VS 2017 + Win32 + + + Debug - VS 2017 + x64 + Release - C++ 03 Win32 @@ -21,16 +49,36 @@ Release - C++ 03 x64 - - Release + + Release - Clang Win32 - - Debug + + Release - Clang x64 - - Release + + Release - VS 2013 + Win32 + + + Release - VS 2013 + x64 + + + Release - VS 2015 + Win32 + + + Release - VS 2015 + x64 + + + Release - VS 2017 + Win32 + + + Release - VS 2017 x64 @@ -41,11 +89,35 @@ + StaticLibrary + true + v141 + MultiByte + + + StaticLibrary + true + v141_clang_c2 + MultiByte + + StaticLibrary true v140 MultiByte + + StaticLibrary + true + v120 + MultiByte + + + StaticLibrary + true + v141 + MultiByte + StaticLibrary true @@ -53,12 +125,40 @@ MultiByte + StaticLibrary + false + v141 + true + MultiByte + + + StaticLibrary + false + v141_clang_c2 + true + MultiByte + + StaticLibrary false v140 true MultiByte + + StaticLibrary + false + v120 + true + MultiByte + + + StaticLibrary + false + v141 + true + MultiByte + StaticLibrary false @@ -67,11 +167,35 @@ MultiByte + StaticLibrary + true + v141 + MultiByte + + + StaticLibrary + true + v141_clang_c2 + MultiByte + + StaticLibrary true v140 MultiByte + + StaticLibrary + true + v120 + MultiByte + + + StaticLibrary + true + v141 + MultiByte + StaticLibrary true @@ -79,12 +203,40 @@ MultiByte + StaticLibrary + false + v141 + true + MultiByte + + + StaticLibrary + false + v141_clang_c2 + true + MultiByte + + StaticLibrary false v140 true MultiByte + + StaticLibrary + false + v120 + true + MultiByte + + + StaticLibrary + false + v141 + true + MultiByte + StaticLibrary false @@ -107,6 +259,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -127,6 +321,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -147,6 +379,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -167,6 +441,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -189,6 +501,46 @@ true + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + Level3 @@ -209,6 +561,46 @@ true + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + Level3 @@ -233,6 +625,62 @@ true + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + Level3 @@ -261,6 +709,62 @@ true + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + Level3 diff --git a/ygen/changelog.txt b/ygen/changelog.txt index 491d4ef..cc90389 100644 --- a/ygen/changelog.txt +++ b/ygen/changelog.txt @@ -1,6 +1,14 @@ # Change log All notable changes to this project are documented in this file. +##[0.1.3] - 2017-09-21 + +### Fixed +• bug in template header.gtpl: behavior classes includes onthe same line + +### Changed +• removed unused include from template source.gtpl + ##[0.1.1] - 2017-04-28 diff --git a/ygen/include/ygen_build_number.hpp b/ygen/include/ygen_build_number.hpp index 5da7ba7..4cad28d 100644 --- a/ygen/include/ygen_build_number.hpp +++ b/ygen/include/ygen_build_number.hpp @@ -20,7 +20,7 @@ namespace version { - const sxe::uint16_t BUILD_NUMBER( 722 ); + const sxe::uint16_t BUILD_NUMBER( 751 ); } diff --git a/ygen/source/ygen_version.cpp b/ygen/source/ygen_version.cpp index 207f546..cc2d551 100644 --- a/ygen/source/ygen_version.cpp +++ b/ygen/source/ygen_version.cpp @@ -28,7 +28,7 @@ namespace const sxe::uint16_t VERSION_MAJOR( 0 ); const sxe::uint16_t VERSION_MINOR( 1 ); -const sxe::uint16_t VERSION_PATCH( 2 ); +const sxe::uint16_t VERSION_PATCH( 3 ); } diff --git a/ygen/templates/header.gtpl b/ygen/templates/header.gtpl index efe864a..b846f5c 100644 --- a/ygen/templates/header.gtpl +++ b/ygen/templates/header.gtpl @@ -8,7 +8,8 @@ #define $var(state_machine_name_caps)_HPP_ #include "yasmine.hpp" -$loop(behavior_classes)#include "$var(behavior_class_name).hpp"$pool$@ +$loop(behavior_classes)#include "$var(behavior_class_name).hpp" +$pool$@ $loop(namespace_open)namespace $var(namespace_name) {$@$@$pool $loop(events)$@Y_EVENT_CREATE($var(event_name), $var(event_id))$pool diff --git a/ygen/templates/source.gtpl b/ygen/templates/source.gtpl index 8d109e3..a874cd6 100644 --- a/ygen/templates/source.gtpl +++ b/ygen/templates/source.gtpl @@ -5,7 +5,6 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////// #include "$var(state_machine_name).hpp" -#include $loop(namespace_open)namespace $var(namespace_name) {$@$@$pool diff --git a/ygen/ygen.vcxproj b/ygen/ygen.vcxproj index 8e130a3..5ef576e 100644 --- a/ygen/ygen.vcxproj +++ b/ygen/ygen.vcxproj @@ -1,5 +1,5 @@  - + Debug - C++ 03 @@ -9,10 +9,38 @@ Debug - C++ 03 x64 - - Debug + + Debug - Clang Win32 + + Debug - Clang + x64 + + + Debug - VS 2013 + Win32 + + + Debug - VS 2013 + x64 + + + Debug - VS 2015 + Win32 + + + Debug - VS 2015 + x64 + + + Debug - VS 2017 + Win32 + + + Debug - VS 2017 + x64 + Release - C++ 03 Win32 @@ -21,16 +49,36 @@ Release - C++ 03 x64 - - Release + + Release - Clang Win32 - - Debug + + Release - Clang x64 - - Release + + Release - VS 2013 + Win32 + + + Release - VS 2013 + x64 + + + Release - VS 2015 + Win32 + + + Release - VS 2015 + x64 + + + Release - VS 2017 + Win32 + + + Release - VS 2017 x64 @@ -42,11 +90,35 @@ + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v120 + MultiByte + + + Application + true + v141 + MultiByte + Application true @@ -54,12 +126,40 @@ MultiByte + Application + false + v141 + true + MultiByte + + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v120 + true + MultiByte + + + Application + false + v141 + true + MultiByte + Application false @@ -68,24 +168,69 @@ MultiByte + Application + true + v141 + MultiByte + + + Application + true + v141_clang_c2 + MultiByte + + Application true v140 MultiByte + + Application + true + v120 + MultiByte + + + Application + true + v141 + MultiByte + Application true v120 MultiByte - + + Application + false + v141_clang_c2 + true + MultiByte + + Application false v140 true MultiByte + + Application + false + v120 + true + MultiByte + + + Application + false + v141 + true + MultiByte + Application false @@ -109,6 +254,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -131,6 +322,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -153,6 +386,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -165,7 +444,39 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -198,6 +509,46 @@ true + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + Level3 @@ -218,6 +569,46 @@ true + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + Level3 @@ -242,6 +633,62 @@ true + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + Level3 @@ -256,7 +703,52 @@ true - + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + MachineX64 + + + Level3 MaxSpeed From 0aea121931a9a833f4bfd88b9b815b53dee13a61 Mon Sep 17 00:00:00 2001 From: Tibor Molnar Date: Thu, 21 Sep 2017 13:39:12 +0200 Subject: [PATCH 4/9] yasmine 1.4.0 --- yasmine_model/include/build_number.hpp | 2 +- yasmine_model/include/composite_state_model.hpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/yasmine_model/include/build_number.hpp b/yasmine_model/include/build_number.hpp index b34f2a7..b7dcf46 100644 --- a/yasmine_model/include/build_number.hpp +++ b/yasmine_model/include/build_number.hpp @@ -24,7 +24,7 @@ namespace version { - const sxe::uint16_t BUILD_NUMBER( 722 ); + const sxe::uint16_t BUILD_NUMBER( 751 ); } diff --git a/yasmine_model/include/composite_state_model.hpp b/yasmine_model/include/composite_state_model.hpp index cc00c30..a05a8ec 100644 --- a/yasmine_model/include/composite_state_model.hpp +++ b/yasmine_model/include/composite_state_model.hpp @@ -47,10 +47,6 @@ class composite_state_model: SX_NO_COPY( composite_state_model ) - virtual const std::string& get_enter_behavior() const = 0; - virtual void set_enter_behavior( const std::string& _enter_behavior ) = 0; - virtual const std::string& get_exit_behavior() const = 0; - virtual void set_exit_behavior( const std::string& _exit_behavior ) = 0; virtual void add_region( region_model_uptr _region ) = 0; virtual raw_const_pseduostate_models get_state_pseudostates() const = 0; virtual void add_state_pseudostate( pseudostate_model_uptr _pseudostate ) = 0; From 11f3a92c27c88ea9be9b718b7fdb9e0af441f65c Mon Sep 17 00:00:00 2001 From: Tibor Molnar Date: Thu, 21 Sep 2017 13:40:30 +0200 Subject: [PATCH 5/9] yasmine 1.4.0 --- yasmine_model/changelog.txt | 11 +- yasmine_model/source/model_version.cpp | 2 +- yasmine_model/yasmine_model.vcxproj | 346 ++++++++++++++++++++++++- 3 files changed, 344 insertions(+), 15 deletions(-) diff --git a/yasmine_model/changelog.txt b/yasmine_model/changelog.txt index 6541240..c353783 100644 --- a/yasmine_model/changelog.txt +++ b/yasmine_model/changelog.txt @@ -2,7 +2,16 @@ All notable changes to this project are documented in this file. -##[1.0.0] - 2017-04-24 +##[0.1.2] - 2017-09-21 + +### Fixed +• removed declaration of 'get_enter_behavior' from the interface composite_state_model because it is already declared in the inherited state_model interface +• removed declaration of 'set_enter_behavior' from the interface composite_state_model because it is already declared in the inherited state_model interface +• removed declaration of 'get_exit_behavior' from the interface composite_state_model because it is already declared in the inherited state_model interface +• removed declaration of 'set_exit_behavior' from the interface composite_state_model because it is already declared in the inherited state_model interface + + +##[0.1.0] - 2017-04-24 • The very first released version of yasmine_model diff --git a/yasmine_model/source/model_version.cpp b/yasmine_model/source/model_version.cpp index 91e4646..e89a6ca 100644 --- a/yasmine_model/source/model_version.cpp +++ b/yasmine_model/source/model_version.cpp @@ -31,7 +31,7 @@ namespace const sxe::uint16_t VERSION_MAJOR( 0 ); -const sxe::uint16_t VERSION_MINOR( 2 ); +const sxe::uint16_t VERSION_MINOR( 1 ); const sxe::uint16_t VERSION_PATCH( 1 ); diff --git a/yasmine_model/yasmine_model.vcxproj b/yasmine_model/yasmine_model.vcxproj index ff35c12..313cb88 100644 --- a/yasmine_model/yasmine_model.vcxproj +++ b/yasmine_model/yasmine_model.vcxproj @@ -1,5 +1,5 @@  - + Debug - C++ 03 @@ -25,12 +25,20 @@ Debug - VS 2013 x64 - - Debug + + Debug - VS 2015 Win32 - - Debug + + Debug - VS 2015 + x64 + + + Debug - VS 2017 + Win32 + + + Debug - VS 2017 x64 @@ -41,6 +49,14 @@ Release - C++ 03 x64 + + Release - Clang + Win32 + + + Release - Clang + x64 + Release - VS 2013 Win32 @@ -49,12 +65,20 @@ Release - VS 2013 x64 - - Release + + Release - VS 2015 Win32 - - Release + + Release - VS 2015 + x64 + + + Release - VS 2017 + Win32 + + + Release - VS 2017 x64 @@ -189,17 +213,41 @@ + StaticLibrary + true + v141 + Unicode + + StaticLibrary true v140 Unicode + + StaticLibrary + true + v141 + Unicode + + StaticLibrary + true + v141 + Unicode + + StaticLibrary true v140 Unicode + + StaticLibrary + true + v141 + Unicode + StaticLibrary true @@ -209,7 +257,7 @@ StaticLibrary true - v140_clang_c2 + v141_clang_c2 Unicode @@ -227,7 +275,7 @@ StaticLibrary true - v140_clang_c2 + v141_clang_c2 Unicode @@ -237,19 +285,61 @@ Unicode + StaticLibrary + false + v141 + true + Unicode + + + StaticLibrary + false + v141_clang_c2 + true + Unicode + + StaticLibrary false v140 true Unicode + + StaticLibrary + false + v141 + true + Unicode + + StaticLibrary + false + v141 + true + Unicode + + + StaticLibrary + false + v141_clang_c2 + true + Unicode + + StaticLibrary false v140 true Unicode + + StaticLibrary + false + v141 + true + Unicode + StaticLibrary false @@ -288,6 +378,20 @@ + + + + + + + + + + + + + + @@ -295,12 +399,28 @@ + + + + + + + + + + + + + + + + @@ -309,7 +429,7 @@ - + @@ -323,8 +443,10 @@ + + @@ -333,7 +455,7 @@ - + @@ -349,17 +471,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -372,7 +534,9 @@ + + @@ -385,6 +549,12 @@ $(SolutionDir)$(Platform)\$(Configuration)\ + + $(SolutionDir)$(Platform)\$(Configuration)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\ + @@ -400,6 +570,36 @@ MachineX86 + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + MachineX86 + + + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + MachineX86 + + @@ -412,6 +612,30 @@ true + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + + + Console + true + + @@ -503,6 +727,54 @@ true + + + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + + + Console + true + true + true + + @@ -519,6 +791,54 @@ true + + + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + + + Console + true + true + true + + From aa7d19238f719edf68657bed45a69a750e7ee8f5 Mon Sep 17 00:00:00 2001 From: Tibor Molnar Date: Thu, 21 Sep 2017 13:42:55 +0200 Subject: [PATCH 6/9] yasmine 1.4.0 --- libyasmine/include/complex_state.hpp | 1 + libyasmine/include/complex_state_impl.hpp | 5 +++-- libyasmine/include/state_impl.hpp | 1 + libyasmine/include/state_machine_base.hpp | 8 ++++++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libyasmine/include/complex_state.hpp b/libyasmine/include/complex_state.hpp index 7701e76..a6019a7 100644 --- a/libyasmine/include/complex_state.hpp +++ b/libyasmine/include/complex_state.hpp @@ -41,6 +41,7 @@ class complex_state: SX_NO_COPY(complex_state) virtual void accept_complex_state_visitor( complex_state_visitor& _visitor ) const = 0; + virtual void add_deferred_event( const event_id& _event_id ) = 0; }; diff --git a/libyasmine/include/complex_state_impl.hpp b/libyasmine/include/complex_state_impl.hpp index 566c19d..b7424dd 100644 --- a/libyasmine/include/complex_state_impl.hpp +++ b/libyasmine/include/complex_state_impl.hpp @@ -26,13 +26,14 @@ class complex_state_impl: public virtual complex_state, public state_impl { public: - explicit complex_state_impl( const std::string& _name, behavior_uptr _entry_behavior, + explicit complex_state_impl( const std::string& _name, behavior_uptr _entry_behavior, behavior_uptr _exit_behavior, const event_ids& _deferred_events = event_ids() ); virtual ~complex_state_impl() SX_NOEXCEPT SX_OVERRIDE; - SX_NO_COPY(complex_state_impl) + SX_NO_COPY(complex_state_impl) virtual behavior * get_entry_behavior() const SX_OVERRIDE; virtual behavior * get_exit_behavior() const SX_OVERRIDE; virtual bool is_event_deferred( const event_id& _event_id ) const SX_OVERRIDE; + virtual void add_deferred_event( const event_id& _event_id ) SX_OVERRIDE; protected: diff --git a/libyasmine/include/state_impl.hpp b/libyasmine/include/state_impl.hpp index 05eff80..dc03b3b 100644 --- a/libyasmine/include/state_impl.hpp +++ b/libyasmine/include/state_impl.hpp @@ -62,6 +62,7 @@ class state_impl: void collect_ancestors_as_regions( raw_regions& _ancestors_as_regions ) const; bool was_active_; + bool is_active_; region* parent_; #ifdef Y_OPTIMIZE_4_SPEED diff --git a/libyasmine/include/state_machine_base.hpp b/libyasmine/include/state_machine_base.hpp index eb23c05..76c9b66 100644 --- a/libyasmine/include/state_machine_base.hpp +++ b/libyasmine/include/state_machine_base.hpp @@ -192,10 +192,12 @@ namespace sxy //!\param _behavior virtual void set_behavior_of_unhandled_event_handler( const behavior_function& _behavior ); + //!\brief Get the name of the state machine. + //!\return name of the state machine + virtual std::string get_name() const; - protected: - std::string get_name() const; + protected: //!\brief Starts the state machine. //!\param _async_event_handler Pointer to an asynchronous event handler. It's used by //!the asynchronous state machine if it has to process asynchronous errors that occur in the @@ -209,7 +211,9 @@ namespace sxy private: virtual const events& get_deferred_events() const SX_OVERRIDE; + public: virtual raw_const_states get_active_state_configuration() const SX_OVERRIDE; + private: void get_active_states_from_region( raw_const_states& _active_state_configuration, const region& _region ) const; void check_regions_for_active_states( raw_const_states& _active_state_configuration, const state& _state ) const; void add_deferred_event( const event_sptr& _event_id ); From a9b63e5181f9c7c67d80222f38bc895853dbf05e Mon Sep 17 00:00:00 2001 From: Tibor Molnar Date: Thu, 21 Sep 2017 13:47:25 +0200 Subject: [PATCH 7/9] yasmine 1.4.0 --- libyasmine/include_impl/build_number.hpp | 2 +- libyasmine/include_impl/composite_state_impl.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libyasmine/include_impl/build_number.hpp b/libyasmine/include_impl/build_number.hpp index 5086f20..2572ab2 100644 --- a/libyasmine/include_impl/build_number.hpp +++ b/libyasmine/include_impl/build_number.hpp @@ -24,7 +24,7 @@ namespace version { -const sxe::uint16_t BUILD_NUMBER( 722 ); +const sxe::uint16_t BUILD_NUMBER( 751 ); } diff --git a/libyasmine/include_impl/composite_state_impl.hpp b/libyasmine/include_impl/composite_state_impl.hpp index 7037831..05224bb 100644 --- a/libyasmine/include_impl/composite_state_impl.hpp +++ b/libyasmine/include_impl/composite_state_impl.hpp @@ -29,7 +29,7 @@ class composite_state_impl SX_FINAL: public virtual composite_state, public complex_state_impl { public: - explicit composite_state_impl( const std::string& _name, behavior_uptr _entry_action = behavior_uptr(), + explicit composite_state_impl( const std::string& _name, behavior_uptr _entry_action = behavior_uptr(), behavior_uptr _exit_action = behavior_uptr(), const event_ids& _deferred_events = event_ids() ); virtual ~composite_state_impl() SX_NOEXCEPT SX_OVERRIDE; SX_NO_COPY(composite_state_impl) From b179e3b62608769f811727a4e132250d6de6bc79 Mon Sep 17 00:00:00 2001 From: Tibor Molnar Date: Thu, 21 Sep 2017 13:49:18 +0200 Subject: [PATCH 8/9] yasmine 1.4.0 --- libyasmine/CMakeLists.txt | 4 +- libyasmine/changelog.txt | 17 ++ libyasmine/libyasmine.vcxproj | 208 +++++++++++++++++++---- libyasmine/source/async_behavior.cpp | 20 +-- libyasmine/source/complex_state_impl.cpp | 17 ++ libyasmine/source/state_impl.cpp | 33 ++-- libyasmine/source/state_machine_base.cpp | 2 + libyasmine/source/transition_finder.cpp | 10 +- libyasmine/source/version.cpp | 4 +- 9 files changed, 253 insertions(+), 62 deletions(-) diff --git a/libyasmine/CMakeLists.txt b/libyasmine/CMakeLists.txt index b15d818..4143bb5 100644 --- a/libyasmine/CMakeLists.txt +++ b/libyasmine/CMakeLists.txt @@ -196,8 +196,8 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") endif() SET_TARGET_PROPERTIES ( libyasmine PROPERTIES - VERSION 1.2.3 - SOVERSION 1.2 ) + VERSION 1.3.0 + SOVERSION 1.3 ) install(TARGETS libyasmine DESTINATION lib) file(GLOB yasmine_hpp "include/*.hpp") diff --git a/libyasmine/changelog.txt b/libyasmine/changelog.txt index 542d6e0..6e58d22 100644 --- a/libyasmine/changelog.txt +++ b/libyasmine/changelog.txt @@ -1,6 +1,23 @@ # Change log All notable changes to this project are documented in this file. + +##[1.3.0] - 2017-09-21 + +### Changed +• get_name is now a public method of the state_machine class + +### Added +• Support for Visual Studio 2017 builds +• complex states (root state of the state machine, simple states and composite states) now have a method called add_deferred_event. +This method adds an event ID to the list of the deferred events IDs. This method is not thread-safe a must only be used before +starting the state machine. + +### Fixed +• On start of the state machine, the root state becomes active and on stop it becomes inactive. +• bug with ::std::toupper and ::std::tolower (reported for VS2017 compiler, version 15.3.4) + + ##[1.2.3] - 2017-08-22 ### Changed diff --git a/libyasmine/libyasmine.vcxproj b/libyasmine/libyasmine.vcxproj index 045a428..006e5a5 100644 --- a/libyasmine/libyasmine.vcxproj +++ b/libyasmine/libyasmine.vcxproj @@ -1,5 +1,5 @@  - + Debug - C++ 03 @@ -21,8 +21,16 @@ Debug - VS 2013 x64 - - Debug + + Debug - VS 2015 + Win32 + + + Debug - VS 2015 + x64 + + + Debug - VS 2017 x64 @@ -41,8 +49,8 @@ Debug - VS 2013 Win32 - - Debug + + Debug - VS 2017 Win32 @@ -57,12 +65,20 @@ Release - VS 2013 x64 - - Release + + Release - VS 2015 + Win32 + + + Release - VS 2015 + x64 + + + Release - VS 2017 Win32 - - Release + + Release - VS 2017 x64 @@ -379,13 +395,25 @@ 8.1 - + + StaticLibrary + true + v141 + Unicode + + StaticLibrary true v140 Unicode - + + StaticLibrary + true + v141 + Unicode + + StaticLibrary true v140 @@ -394,25 +422,25 @@ StaticLibrary true - v140_clang_c2 + v141_clang_c2 Unicode StaticLibrary true - v140_clang_c2 + v141_clang_c2 Unicode StaticLibrary true - v140_clang_c2 + v141_clang_c2 Unicode StaticLibrary true - v140_Clang_3_7 + v141_clang_c2 Unicode @@ -424,8 +452,8 @@ StaticLibrary true - v120 Unicode + v120 StaticLibrary @@ -439,14 +467,28 @@ v120 Unicode - + + StaticLibrary + false + v141 + true + Unicode + + StaticLibrary false v140 true Unicode - + + StaticLibrary + false + v141 + true + Unicode + + StaticLibrary false v140 @@ -484,27 +526,41 @@ - + - + - + + + + + + + + + + + + + + + @@ -512,16 +568,18 @@ - + + + @@ -549,6 +607,8 @@ + + @@ -558,13 +618,25 @@ - + - + + + + + + + + + + + + + @@ -575,6 +647,8 @@ + + @@ -588,6 +662,8 @@ + + @@ -597,7 +673,11 @@ - + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ @@ -619,10 +699,29 @@ $(Platform)\$(Configuration)\ - + $(Platform)\$(Configuration)\ - + + $(Platform)\$(Configuration)\ + + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + + + $(SolutionDir)$(Platform)\$(Configuration)\$(TargetName)$(TargetExt) + MachineX86 + + + @@ -638,7 +737,22 @@ MachineX86 - + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + + + $(SolutionDir)$(Platform)\$(Configuration)\$(TargetName)$(TargetExt) + + + @@ -745,7 +859,7 @@ true - + @@ -762,7 +876,41 @@ true - + + + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + None + + + Windows + true + true + true + + + + + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + NotSet + + + Windows + true + true + true + + + diff --git a/libyasmine/source/async_behavior.cpp b/libyasmine/source/async_behavior.cpp index 1ed4ccb..7508173 100644 --- a/libyasmine/source/async_behavior.cpp +++ b/libyasmine/source/async_behavior.cpp @@ -26,7 +26,7 @@ namespace sxy async_behavior::async_behavior() : worker_(), mutex_(), - run_(false) + run_(false) { // Nothing to do... } @@ -41,7 +41,7 @@ async_behavior::~async_behavior() SX_NOEXCEPT void async_behavior::run( const event& _event, event_collector& _event_collector, const simple_state_base& _simple_state, async_event_handler& _async_event_handler ) -{ +{ run_ = true; worker_ = SX_MAKE_UNIQUE< sxe::thread >( sxe::bind( &async_behavior::work, this, sxe::ref( _event ), @@ -50,14 +50,14 @@ void async_behavior::run( const event& _event, event_collector& _event_collector void async_behavior::halt_and_join() -{ +{ { sxe::lock_guard< sxe::mutex > lock( mutex_ ); run_ = false; - notify_should_stop(); + notify_should_stop(); } - join(); + join(); } @@ -76,21 +76,21 @@ void async_behavior::notify_should_stop() void async_behavior::work( const event& _event, event_collector& _event_collector, const simple_state_base& _simple_state, async_event_handler& _async_event_handler ) -{ +{ try - { + { run_impl( _event, _event_collector, _async_event_handler ); } catch( const sxy::behavior_exception& exception ) - { + { SX_LOG( hermes::log_level::LL_DEBUG, "behavior_exception while running async_behavior: %", exception.what() ); _async_event_handler.on_event( exception.get_error_event() ); } catch( const std::exception& exception ) { - SX_LOG( hermes::log_level::LL_DEBUG, "std::exception while running async_behavior: %", exception.what() ); + SX_LOG( hermes::log_level::LL_DEBUG, "std::exception while running async_behavior: %", exception.what() ); if( _simple_state.has_error_event() ) - { + { _async_event_handler.on_event( _simple_state.get_error_event() ); } else diff --git a/libyasmine/source/complex_state_impl.cpp b/libyasmine/source/complex_state_impl.cpp index 0711726..f64bf7c 100644 --- a/libyasmine/source/complex_state_impl.cpp +++ b/libyasmine/source/complex_state_impl.cpp @@ -14,6 +14,7 @@ #include #include "essentials/base.hpp" +#include "hermes/log.hpp" #include "transition.hpp" @@ -59,6 +60,22 @@ bool complex_state_impl::is_event_deferred( const event_id& _event_id ) const } +void complex_state_impl::add_deferred_event( const event_id& _event_id ) +{ + if( std::find( deferred_events_.begin(), deferred_events_.end(), _event_id ) == deferred_events_.end() ) + { + deferred_events_.push_back( _event_id ); + SX_LOG( hermes::log_level::LL_TRACE, "Event with ID '%' is now deferred by the state '%'.", + _event_id, get_name() ); + } + else + { + SX_LOG( hermes::log_level::LL_TRACE, "Event with ID '%' is already deferred by the state '%'.", + _event_id, get_name() ); + } +} + + bool complex_state_impl::check_if_one_of_the_deferred_events_triggers_a_transition() const { bool deferred_event_trigger_a_transition = false; diff --git a/libyasmine/source/state_impl.cpp b/libyasmine/source/state_impl.cpp index a92e330..bcb60a8 100644 --- a/libyasmine/source/state_impl.cpp +++ b/libyasmine/source/state_impl.cpp @@ -33,16 +33,17 @@ namespace sxy state_impl::state_impl( const std::string& _name ) : vertex_impl( _name ), was_active_( false ), + is_active_( false ), parent_() #ifdef Y_OPTIMIZE_4_SPEED , ancestors_(), ancestors_as_regions_() -#endif +#endif { #ifdef Y_OPTIMIZE_4_SPEED ancestors_as_regions_.reserve( ANCESTORS_VECTOR_SIZE ); ancestors_.reserve( ANCESTORS_VECTOR_SIZE ); -#endif +#endif } @@ -119,10 +120,10 @@ raw_composite_states state_impl::get_ancestors( composite_state* const _final_an if( final_ancestor != ancestors_.end() ) { - raw_composite_states ancestors( ancestors_.begin(), final_ancestor + 1 ); + raw_composite_states ancestors( ancestors_.begin(), final_ancestor + 1 ); if( !_include_final_ancestor ) - { - ancestors.erase( final_ancestor ); + { + ancestors.erase( final_ancestor ); } return( ancestors ); } @@ -132,12 +133,12 @@ raw_composite_states state_impl::get_ancestors( composite_state* const _final_an return( ancestors ); } } -#else +#else raw_composite_states ancestors; - collect_ancestors( ancestors, _final_ancestor ); + collect_ancestors( ancestors, _final_ancestor ); if( !_include_final_ancestor ) - { - ancestors.erase( std::remove( ancestors.begin(), ancestors.end(), _final_ancestor ), ancestors.end() ); + { + ancestors.erase( std::remove( ancestors.begin(), ancestors.end(), _final_ancestor ), ancestors.end() ); } return( ancestors ); #endif @@ -145,7 +146,7 @@ raw_composite_states state_impl::get_ancestors( composite_state* const _final_an raw_regions state_impl::get_ancestors_as_regions() const -{ +{ #ifdef Y_OPTIMIZE_4_SPEED if( ancestors_as_regions_.empty() ) { @@ -183,6 +184,7 @@ bool state_impl::was_active() const void state_impl::set_active() { + is_active_ = true; region* const parent_region = get_parent_region(); if( parent_region ) { @@ -198,6 +200,7 @@ void state_impl::set_active() { SX_ASSERT( parent_region, "State has no parent region!" ); } + root_state->set_was_active(); } } @@ -205,8 +208,12 @@ void state_impl::set_active() void state_impl::set_inactive() { region* const parent_region = get_parent_region(); - parent_region->set_active_state( SX_NULLPTR ); + if( parent_region ) + { + parent_region->set_active_state( SX_NULLPTR ); + } set_was_active(); + is_active_ = false; SX_LOG( hermes::log_level::LL_DEBUG, "State '%' is now inactive.", get_uri().to_string() ); } @@ -221,7 +228,7 @@ bool state_impl::is_active() const } else { - is_active = true; + is_active = is_active_; } return( is_active ); @@ -302,7 +309,7 @@ void state_impl::collect_ancestors( raw_composite_states& _ancestors, composite_ region* const parent_region = current_vertex->get_parent_region(); if( parent_region != SX_NULLPTR ) { - composite_state& parent_state = parent_region->get_parent_state(); + composite_state& parent_state = parent_region->get_parent_state(); _ancestors.push_back( &parent_state ); current_vertex = &parent_state; } diff --git a/libyasmine/source/state_machine_base.cpp b/libyasmine/source/state_machine_base.cpp index 1a269b4..f9def39 100644 --- a/libyasmine/source/state_machine_base.cpp +++ b/libyasmine/source/state_machine_base.cpp @@ -218,6 +218,7 @@ namespace sxy if( state_machine_is_running_ ) { stop_all_async_states( *root_state_ ); + root_state_->set_inactive(); state_machine_is_running_ = false; } @@ -255,6 +256,7 @@ namespace sxy SX_ASSERT( root_state_, "No root state!" ); bool state_machine_started = false; state_machine_is_running_ = true; + root_state_->set_active(); interrupt_ = false; try diff --git a/libyasmine/source/transition_finder.cpp b/libyasmine/source/transition_finder.cpp index 62c7444..58179e5 100644 --- a/libyasmine/source/transition_finder.cpp +++ b/libyasmine/source/transition_finder.cpp @@ -40,15 +40,15 @@ transition_finder::~transition_finder() SX_NOEXCEPT void transition_finder::search_for_enabled_transitions_in_all_regions( const state& _current_state, - const event& _event, compound_transitions& _enabled_compound_transitions, bool& _event_is_deferred, + const event& _event, compound_transitions& _enabled_compound_transitions, bool& _event_is_deferred, event_collector& _event_collector ) const { search_for_transition( _current_state, _enabled_compound_transitions, _event, _event_is_deferred, _event_collector ); } -void transition_finder::search_for_enabled_completion_transitions_in_all_regions( const state& _current_state, - compound_transitions& _enabled_compound_transitions, bool& _event_is_deferred, +void transition_finder::search_for_enabled_completion_transitions_in_all_regions( const state& _current_state, + compound_transitions& _enabled_compound_transitions, bool& _event_is_deferred, event_collector& _event_collector ) const { search_for_transition( _current_state, _enabled_compound_transitions, *sxy::completion_event::create(), @@ -56,7 +56,7 @@ void transition_finder::search_for_enabled_completion_transitions_in_all_regions } -void transition_finder::search_initial_transitions( const composite_state& _state, +void transition_finder::search_initial_transitions( const composite_state& _state, compound_transitions& _compound_transitions, event_collector& _event_collector ) { SX_FOR( const region_uptr& region, _state.get_regions() ) @@ -165,7 +165,7 @@ bool transition_finder::search_for_transition( const state& _current_state, const bool l_found = search_for_transition( *active_state, _enabled_compound_transitions, _event, _event_is_deferred, _event_collector ); if( l_found ) - { + { SX_LOG( hermes::log_level::LL_SPAM, "Transition found in active state '%'.", active_state->get_name() ); found = l_found; } diff --git a/libyasmine/source/version.cpp b/libyasmine/source/version.cpp index af6faa5..a7e6605 100644 --- a/libyasmine/source/version.cpp +++ b/libyasmine/source/version.cpp @@ -27,8 +27,8 @@ namespace const sxe::uint16_t VERSION_MAJOR( 1 ); -const sxe::uint16_t VERSION_MINOR( 2 ); -const sxe::uint16_t VERSION_PATCH( 3 ); +const sxe::uint16_t VERSION_MINOR( 3 ); +const sxe::uint16_t VERSION_PATCH( 0 ); } From 74aa835b1bf6b6e850edfe9ff02df89c472cc9cd Mon Sep 17 00:00:00 2001 From: Tibor Molnar Date: Thu, 21 Sep 2017 13:50:22 +0200 Subject: [PATCH 9/9] yasmine 1.4.0 --- version.txt | 129 ++++++++++++++++++++++++++++------------------------ 1 file changed, 69 insertions(+), 60 deletions(-) diff --git a/version.txt b/version.txt index d4b119f..e306207 100644 --- a/version.txt +++ b/version.txt @@ -1,62 +1,71 @@ Versions -• yasmine 1.3.3 released 2017-08-22 - • libyasmine 1.2.3 - • essentials 1.3.1 - • hermes 1.1.2 - • genesis 0.3.1 - • yasmine_model 0.2.1 - • libygen 0.2.1 - • ygen 0.1.2 - - -• yasmine 1.3.2 released 2017-08-18 - • libyasmine 1.2.2 - • essentials 1.3.1 - • hermes 1.1.2 - • genesis 0.3.1 - • yasmine_model 0.2.1 - • libygen 0.2.1 - • ygen 0.1.2 - - -• yasmine 1.3.1 released 2017-08-14 - • libyasmine 1.2.1 - • essentials 1.3.1 - • hermes 1.1.1 - • genesis 0.3.1 - • yasmine_model 0.2.1 - • libygen 0.2.1 - • ygen 0.1.2 - - -• yasmine 1.3.0 released 2017-06-26 - • libyasmine 1.2.0 - • essentials 1.3.0 - • hermes 1.1.0 - • genesis 0.3.0 - • yasmine_model 0.2.0 - • libygen 0.2.0 - • ygen 0.1.1 - - -• yasmine 1.2.1 released 2017-04-28 - • libyasmine 1.1.2 - • essentials 1.2.0 - • hermes 1.0.1 - • genesis 0.2.0 - • yasmine_model 0.1.0 - • libygen 0.1.0 - • ygen 0.1.1 - - -• yasmine 1.2.0 released 2017-04-25 - • libyasmine 1.1.2 - • essentials 1.2.0 - • hermes 1.0.1 - • genesis 0.2.0 - • yasmine_model 0.1.0 - • libygen 0.1.0 - • ygen 0.1.0 - - \ No newline at end of file +• yasmine 1.4.0 released 2017-09-21 + • libyasmine 1.3.0 + • essentials 1.3.1 + • hermes 1.1.2 + • genesis 0.3.1 + • yasmine_model 0.1.2 + • libygen 0.1.1 + • ygen 0.1.3 + +• yasmine 1.3.3 released 2017-08-22 + • libyasmine 1.2.3 + • essentials 1.3.1 + • hermes 1.1.2 + • genesis 0.3.1 + • yasmine_model 0.1.2 + • libygen 0.1.1 + • ygen 0.1.3 + + +• yasmine 1.3.2 released 2017-08-18 + • libyasmine 1.2.2 + • essentials 1.3.1 + • hermes 1.1.2 + • genesis 0.3.1 + • yasmine_model 0.1.2 + • libygen 0.1.1 + • ygen 0.1.3 + + +• yasmine 1.3.1 released 2017-08-14 + • libyasmine 1.2.1 + • essentials 1.3.1 + • hermes 1.1.1 + • genesis 0.3.1 + • yasmine_model 0.1.2 + • libygen 0.1.1 + • ygen 0.1.3 + + +• yasmine 1.3.0 released 2017-06-26 + • libyasmine 1.2.0 + • essentials 1.3.0 + • hermes 1.1.0 + • genesis 0.3.0 + • yasmine_model 0.1.1 + • libygen 0.1.0 + • ygen 0.1.2 + + +• yasmine 1.2.1 released 2017-04-28 + • libyasmine 1.1.2 + • essentials 1.2.0 + • hermes 1.0.1 + • genesis 0.2.0 + • yasmine_model 0.1.0 + • libygen 0.1.0 + • ygen 0.1.1 + + +• yasmine 1.2.0 released 2017-04-25 + • libyasmine 1.1.2 + • essentials 1.2.0 + • hermes 1.0.1 + • genesis 0.2.0 + • yasmine_model 0.1.0 + • libygen 0.1.0 + • ygen 0.1.0 + +