diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2023-06-05 00:07:21 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2023-07-05 00:07:21 +0200 |
| commit | a930747329e7a428578e3e4af3f29a5c23f49ec7 (patch) | |
| tree | 290c9d05abb4fc11f2e561f8eafa5b314b48afad | |
| parent | 8eafe8f1b65193784c84eb9b35db2684b1e1dd2f (diff) | |
Fixed ArchLinux build.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | Makefile.inc | 1 | ||||
| -rw-r--r-- | Makefile.native.inc | 4 | ||||
| -rw-r--r-- | examples/dpp-example-cplusplus-EASTL.cpp | 18 |
3 files changed, 19 insertions, 4 deletions
diff --git a/Makefile.inc b/Makefile.inc index 4d6f00d..c426576 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -61,6 +61,7 @@ endif CXXFLAGS := -fno-exceptions -fno-rtti -fuse-cxa-atexit EASTL_CXXFLAGS := -I$(DPP_ROOT)/EASTL/include -I$(DPP_ROOT)/EASTL/test/packages/EABase/include/Common \ + -DEASTL_EABASE_DISABLED=1 \ -DEASTL_THREAD_SUPPORT_AVAILABLE=0 \ -DEASTL_EXCEPTIONS_ENABLED=0 \ -DEASTL_ASSERT_ENABLED=0 \ diff --git a/Makefile.native.inc b/Makefile.native.inc index 95ed10a..6c07789 100644 --- a/Makefile.native.inc +++ b/Makefile.native.inc @@ -18,9 +18,9 @@ INSTALL = install CMAKE = cmake CC = /usr/bin/cc CXX = /usr/bin/c++ -CFLAGS := -Wall -Wextra -Wno-sign-compare -Wno-strict-aliasing \ +CFLAGS := -Wall -Wextra -Wno-sign-compare -Wno-strict-aliasing -Wno-c++20-compat \ -m64 -fPIC -fvisibility=hidden \ - -ffunction-sections -fdata-sections -fno-builtin -ffreestanding \ + -ffunction-sections -fdata-sections \ -I$(DPP_ROOT)/CRT ifneq ($(WERROR),) CFLAGS += -Werror diff --git a/examples/dpp-example-cplusplus-EASTL.cpp b/examples/dpp-example-cplusplus-EASTL.cpp index d112a85..618bc68 100644 --- a/examples/dpp-example-cplusplus-EASTL.cpp +++ b/examples/dpp-example-cplusplus-EASTL.cpp @@ -32,6 +32,18 @@ typedef UNICODE_STRING * PUNICODE_STRING; typedef int NTSTATUS; #endif +struct GeneratorUint32 +{ + uint32_t mValue; + GeneratorUint32() : mValue(0) + { + } + uint32_t operator()() + { + return mValue++; + } +}; + using namespace eastl; // C&P from: https://raw.githubusercontent.com/sidyhe/dxx/ed06aba3b91fe8e101d08c33c26ba73db96acef0/README.md @@ -95,13 +107,15 @@ void more_stl_test() #endif uniform_int_distribution<std::uint32_t> uid(1, UINT32_MAX); - DbgPrint("PRNG: %u\n", uid); + GeneratorUint32 g; + DbgPrint("PRNG: %u\n", uid(g)); auto lambda = [] { DbgPrint("Hello lambda!\n"); }; function<void(void)> fn = lambda; fn(); - auto lambda2 = [](int n) { + auto lambda2 = [](int n) + { DbgPrint("Hello lambda2, %u!\n", n); return n; }; |