Formatting: Fix indentation of public/private specifiers

pull/491/head
Jonathan G Rennison 1 year ago
parent 0a8c58b755
commit 88d7a8ea13

@ -77,11 +77,11 @@ struct CommandAuxiliarySerialisable : public CommandAuxiliaryBase {
template <typename T> template <typename T>
struct CommandAuxData { struct CommandAuxData {
private: private:
opt::optional<T> store; opt::optional<T> store;
const T *data = nullptr; const T *data = nullptr;
public: public:
inline CommandCost Load(const CommandAuxiliaryBase *base) inline CommandCost Load(const CommandAuxiliaryBase *base)
{ {
if (base == nullptr) return CMD_ERROR; if (base == nullptr) return CMD_ERROR;

@ -33,7 +33,7 @@ class UniformArenaAllocator {
used_blocks.push_back(current_block); used_blocks.push_back(current_block);
} }
public: public:
UniformArenaAllocator() = default; UniformArenaAllocator() = default;
UniformArenaAllocator(const UniformArenaAllocator &other) = delete; UniformArenaAllocator(const UniformArenaAllocator &other) = delete;
UniformArenaAllocator& operator=(const UniformArenaAllocator &other) = delete; UniformArenaAllocator& operator=(const UniformArenaAllocator &other) = delete;

@ -34,7 +34,7 @@ class DynUniformArenaAllocator {
used_blocks.push_back(current_block); used_blocks.push_back(current_block);
} }
public: public:
DynUniformArenaAllocator() = default; DynUniformArenaAllocator() = default;
DynUniformArenaAllocator(const DynUniformArenaAllocator &other) = delete; DynUniformArenaAllocator(const DynUniformArenaAllocator &other) = delete;
DynUniformArenaAllocator& operator=(const DynUniformArenaAllocator &other) = delete; DynUniformArenaAllocator& operator=(const DynUniformArenaAllocator &other) = delete;

@ -33,7 +33,7 @@ class PodPool {
used_blocks.push_back(current_block); used_blocks.push_back(current_block);
} }
public: public:
PodPool() = default; PodPool() = default;
PodPool(const PodPool &other) = delete; PodPool(const PodPool &other) = delete;
PodPool& operator=(const PodPool &other) = delete; PodPool& operator=(const PodPool &other) = delete;

@ -170,14 +170,14 @@ enum SlXvFeatureTestOperator {
struct SlXvFeatureTest { struct SlXvFeatureTest {
using TestFunctorPtr = bool (*)(uint16, bool, const std::array<uint16, XSLFI_SIZE> &); ///< Return true if feature present, first parameter is standard savegame version, second is whether standard savegame version is within bounds using TestFunctorPtr = bool (*)(uint16, bool, const std::array<uint16, XSLFI_SIZE> &); ///< 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 min_version;
uint16 max_version; uint16 max_version;
SlXvFeatureIndex feature; SlXvFeatureIndex feature;
SlXvFeatureTestOperator op; SlXvFeatureTestOperator op;
TestFunctorPtr functor = nullptr; TestFunctorPtr functor = nullptr;
public: public:
SlXvFeatureTest() SlXvFeatureTest()
: min_version(0), max_version(0), feature(XSLFI_NULL), op(XSLFTO_OR) { } : min_version(0), max_version(0), feature(XSLFI_NULL), op(XSLFTO_OR) { }

@ -18,7 +18,7 @@ class scope_exit_obj {
bool shouldexec; bool shouldexec;
public: public:
scope_exit_obj(T &&func) scope_exit_obj(T &&func)
: f(std::move(func)), shouldexec(true) { } : f(std::move(func)), shouldexec(true) { }

@ -1099,7 +1099,7 @@ struct TraceRestrictSlot : TraceRestrictSlotPool::PoolItem<&_tracerestrictslot_p
void Clear(); void Clear();
void UpdateSignals(); void UpdateSignals();
private: private:
void DeIndex(VehicleID id); void DeIndex(VehicleID id);
}; };

Loading…
Cancel
Save