mirror of
https://github.com/OpenRCT2/OpenRCT2.git
synced 2026-05-06 07:56:46 -04:00
clang-format: change IndentPPDirectives to BeforeHash (#23287)
This commit is contained in:
+1
-1
@@ -62,7 +62,7 @@ IncludeCategories:
|
||||
- Regex: '^<'
|
||||
Priority: 2
|
||||
IndentCaseLabels: true
|
||||
IndentPPDirectives: AfterHash
|
||||
IndentPPDirectives: BeforeHash
|
||||
IndentWidth: 4
|
||||
IndentWrappedFunctionNames: true
|
||||
KeepEmptyLinesAtTheStartOfBlocks: false
|
||||
|
||||
@@ -9,22 +9,22 @@
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
// Windows.h needs to be included first
|
||||
// clang-format off
|
||||
// windows.h needs to be included first
|
||||
#ifndef WIN32_LEAN_AND_MEAN
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#endif
|
||||
# include <openrct2/Diagnostic.h>
|
||||
#include <windows.h>
|
||||
#include <shellapi.h>
|
||||
// clang-format on
|
||||
#undef CreateWindow
|
||||
// clang-format on
|
||||
|
||||
// Then the rest
|
||||
#include "UiContext.h"
|
||||
|
||||
#include <SDL.h>
|
||||
#include <SDL_syswm.h>
|
||||
#include <openrct2/Diagnostic.h>
|
||||
#include <openrct2/core/Path.hpp>
|
||||
#include <openrct2/core/String.hpp>
|
||||
#include <openrct2/ui/UiContext.h>
|
||||
|
||||
@@ -31,9 +31,9 @@ static uint32_t _allocatedImageCount;
|
||||
#ifdef DEBUG_LEVEL_1
|
||||
static std::list<ImageList> _allocatedLists;
|
||||
|
||||
// MSVC's compiler doesn't support the [[maybe_unused]] attribute for unused static functions. Until this has been resolved, we
|
||||
// need to explicitly tell the compiler to temporarily disable the warning.
|
||||
// See discussion at https://github.com/OpenRCT2/OpenRCT2/pull/7617
|
||||
// MSVC's compiler doesn't support the [[maybe_unused]] attribute for unused static functions. Until this has been resolved,
|
||||
// we need to explicitly tell the compiler to temporarily disable the warning. See discussion at
|
||||
// https://github.com/OpenRCT2/OpenRCT2/pull/7617
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable : 4505) // unreferenced local function has been removed
|
||||
|
||||
|
||||
Reference in New Issue
Block a user