From f72c392fe5752d730f53177e46d81e5032076212 Mon Sep 17 00:00:00 2001 From: Rowan Ramsey Date: Fri, 22 Sep 2023 20:14:53 +0200 Subject: [PATCH] fixed git ignore, --- .gitignore | 2 +- applications/rsl_test/src/rsl_test/source.cpp | 13 ++++++++++++- .../sandbox/engine/tools => tools}/premake5.exe | Bin 3 files changed, 13 insertions(+), 2 deletions(-) rename {applications/sandbox/src/sandbox/engine/tools => tools}/premake5.exe (100%) diff --git a/.gitignore b/.gitignore index 5bfdcd872..04f7c33d3 100644 --- a/.gitignore +++ b/.gitignore @@ -92,7 +92,7 @@ bld/ !**/engine/resources/** # Rythe engine tools folder -!tools/ +!**/tools/** # Word temporary files ~$*.* diff --git a/applications/rsl_test/src/rsl_test/source.cpp b/applications/rsl_test/src/rsl_test/source.cpp index 330baceb6..69648635a 100644 --- a/applications/rsl_test/src/rsl_test/source.cpp +++ b/applications/rsl_test/src/rsl_test/source.cpp @@ -16,7 +16,9 @@ static void func() { } static void func2(unsigned& i) { - std::cout << "function" << i << "\n"; + static unsigned tmp = 0; + static volatile unsigned* ptr = &tmp; + *ptr = i; } struct Object { @@ -117,6 +119,15 @@ void delegate_test(size_t i) { } void stl_test(size_t i) { + + std::function del2; + + { + del2 = &func2; + rsl::uint32 t = 0; + del2(t); + } + std::function del; { diff --git a/applications/sandbox/src/sandbox/engine/tools/premake5.exe b/tools/premake5.exe similarity index 100% rename from applications/sandbox/src/sandbox/engine/tools/premake5.exe rename to tools/premake5.exe