From ea297196b7135faac820073d0ce107e43a734d48 Mon Sep 17 00:00:00 2001 From: Desour Date: Tue, 21 Feb 2023 18:30:14 +0100 Subject: [PATCH] Resolve some -Wreorder warnings --- source/Irrlicht/CIrrDeviceLinux.h | 7 +++---- source/Irrlicht/CWriteFile.cpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/source/Irrlicht/CIrrDeviceLinux.h b/source/Irrlicht/CIrrDeviceLinux.h index c456a1a..ea50d7c 100644 --- a/source/Irrlicht/CIrrDeviceLinux.h +++ b/source/Irrlicht/CIrrDeviceLinux.h @@ -414,6 +414,9 @@ namespace irr bool HasNetWM; // text is utf-8 mutable core::stringc Clipboard; +#endif +#if defined(_IRR_LINUX_X11_XINPUT2_) + int currentTouchedCount; #endif u32 Width, Height; bool WindowHasFocus; @@ -454,10 +457,6 @@ namespace irr }; core::array ActiveJoysticks; #endif - -#if defined(_IRR_LINUX_X11_XINPUT2_) - int currentTouchedCount; -#endif }; diff --git a/source/Irrlicht/CWriteFile.cpp b/source/Irrlicht/CWriteFile.cpp index aa07b49..2af6936 100644 --- a/source/Irrlicht/CWriteFile.cpp +++ b/source/Irrlicht/CWriteFile.cpp @@ -12,7 +12,7 @@ namespace io CWriteFile::CWriteFile(const io::path& fileName, bool append) -: FileSize(0), Filename(fileName) +: Filename(fileName), FileSize(0) { #ifdef _DEBUG setDebugName("CWriteFile");