From 88d7a8ea1378236df054ef2521ede0d627e6a43c Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 28 Feb 2023 01:44:28 +0000 Subject: [PATCH] Formatting: Fix indentation of public/private specifiers --- src/command_aux.h | 4 ++-- src/core/arena_alloc.hpp | 2 +- src/core/dyn_arena_alloc.hpp | 2 +- src/core/pod_pool.hpp | 2 +- src/saveload/extended_ver_sl.h | 4 ++-- src/scope.h | 2 +- src/tracerestrict.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/command_aux.h b/src/command_aux.h index 2efafadb85..360b36b4b6 100644 --- a/src/command_aux.h +++ b/src/command_aux.h @@ -77,11 +77,11 @@ struct CommandAuxiliarySerialisable : public CommandAuxiliaryBase { template struct CommandAuxData { - private: +private: opt::optional store; const T *data = nullptr; - public: +public: inline CommandCost Load(const CommandAuxiliaryBase *base) { if (base == nullptr) return CMD_ERROR; diff --git a/src/core/arena_alloc.hpp b/src/core/arena_alloc.hpp index 0fd19aef97..92cb361998 100644 --- a/src/core/arena_alloc.hpp +++ b/src/core/arena_alloc.hpp @@ -33,7 +33,7 @@ class UniformArenaAllocator { used_blocks.push_back(current_block); } - public: +public: UniformArenaAllocator() = default; UniformArenaAllocator(const UniformArenaAllocator &other) = delete; UniformArenaAllocator& operator=(const UniformArenaAllocator &other) = delete; diff --git a/src/core/dyn_arena_alloc.hpp b/src/core/dyn_arena_alloc.hpp index 24e8843737..b945c084f3 100644 --- a/src/core/dyn_arena_alloc.hpp +++ b/src/core/dyn_arena_alloc.hpp @@ -34,7 +34,7 @@ class DynUniformArenaAllocator { used_blocks.push_back(current_block); } - public: +public: DynUniformArenaAllocator() = default; DynUniformArenaAllocator(const DynUniformArenaAllocator &other) = delete; DynUniformArenaAllocator& operator=(const DynUniformArenaAllocator &other) = delete; diff --git a/src/core/pod_pool.hpp b/src/core/pod_pool.hpp index 11c9b974e0..99c511c3ff 100644 --- a/src/core/pod_pool.hpp +++ b/src/core/pod_pool.hpp @@ -33,7 +33,7 @@ class PodPool { used_blocks.push_back(current_block); } - public: +public: PodPool() = default; PodPool(const PodPool &other) = delete; PodPool& operator=(const PodPool &other) = delete; diff --git a/src/saveload/extended_ver_sl.h b/src/saveload/extended_ver_sl.h index c384210201..f956257522 100644 --- a/src/saveload/extended_ver_sl.h +++ b/src/saveload/extended_ver_sl.h @@ -170,14 +170,14 @@ enum SlXvFeatureTestOperator { struct SlXvFeatureTest { using TestFunctorPtr = bool (*)(uint16, bool, const std::array &); ///< Return true if feature present, first parameter is standard savegame version, second is whether standard savegame version is within bounds - private: +private: uint16 min_version; uint16 max_version; SlXvFeatureIndex feature; SlXvFeatureTestOperator op; TestFunctorPtr functor = nullptr; - public: +public: SlXvFeatureTest() : min_version(0), max_version(0), feature(XSLFI_NULL), op(XSLFTO_OR) { } diff --git a/src/scope.h b/src/scope.h index 912cc9bbe1..d3b816b2f0 100644 --- a/src/scope.h +++ b/src/scope.h @@ -18,7 +18,7 @@ class scope_exit_obj { bool shouldexec; - public: +public: scope_exit_obj(T &&func) : f(std::move(func)), shouldexec(true) { } diff --git a/src/tracerestrict.h b/src/tracerestrict.h index 21e51694b5..40d4e8216b 100644 --- a/src/tracerestrict.h +++ b/src/tracerestrict.h @@ -1099,7 +1099,7 @@ struct TraceRestrictSlot : TraceRestrictSlotPool::PoolItem<&_tracerestrictslot_p void Clear(); void UpdateSignals(); - private: +private: void DeIndex(VehicleID id); };