Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ BasedOnStyle: Google
ColumnLimit: 120
UseTab: Never
AllowShortFunctionsOnASingleLine: Empty
IndentPPDirectives: AfterHash
SortIncludes: true
FixNamespaceComments: true
InsertBraces: true
QualifierAlignment: Left
PointerAlignment: Right
ReferenceAlignment: Right
Expand Down
6 changes: 3 additions & 3 deletions 3rdparty/stb_library.hpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#pragma once

#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcast-align"
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wcast-align"
#endif

#include "stb/stb_image.h"

#if defined(__clang__)
#pragma clang diagnostic pop
# pragma clang diagnostic pop
#endif
8 changes: 4 additions & 4 deletions modules/util/include/util.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
#include <string>
#include <typeinfo>
#ifdef __GNUG__
#include <cxxabi.h>
# include <cxxabi.h>
#endif

#include "nlohmann/json_fwd.hpp"

#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4459)
# pragma warning(push)
# pragma warning(disable : 4459)
#endif

#include <nlohmann/json.hpp>
Expand All @@ -25,7 +25,7 @@ using NlohmannJsonParseError = nlohmann::json::parse_error;
/// @brief JSON namespace used for settings and config typing.
using NlohmannJsonTypeError = nlohmann::json::type_error;
#ifdef _MSC_VER
#pragma warning(pop)
# pragma warning(pop)
#endif

namespace ppc::util {
Expand Down
Loading