From a79f814d3cc7c204295dcc71df7ae3e258b951cc Mon Sep 17 00:00:00 2001 From: Alison Watson Date: Wed, 3 Jul 2019 19:27:47 -0400 Subject: [PATCH] tycho: use consistent style for storage duration modifiers --- tycho/cc/project.cc | 6 ++++-- tycho/cc/tycho.h | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tycho/cc/project.cc b/tycho/cc/project.cc index c07a0a7..91c6d66 100644 --- a/tycho/cc/project.cc +++ b/tycho/cc/project.cc @@ -1,13 +1,15 @@ #include "tycho.h" -static ProjectModel *makeModel(Project *proj) +static +ProjectModel *makeModel(Project *proj) { switch(proj->getType()) { case ProjectType::Map: return new MapModel(proj); } } -static ProjectView *makeView(Project *proj) +static +ProjectView *makeView(Project *proj) { switch(proj->getType()) { case ProjectType::Map: return new MapView(proj); diff --git a/tycho/cc/tycho.h b/tycho/cc/tycho.h index daae988..3621e11 100644 --- a/tycho/cc/tycho.h +++ b/tycho/cc/tycho.h @@ -169,8 +169,8 @@ private: #pragma clang diagnostic ignored "-Wformat-security" template -static inline void dbgPrint([[maybe_unused]] char const *fmt, - [[maybe_unused]] VA &&...va) +static inline +void dbgPrint([[maybe_unused]] char const *fmt, [[maybe_unused]] VA &&...va) { #ifdef TYCHO_DEBUG_ASSERTIONS qDebug(fmt, std::forward(va)...); @@ -181,7 +181,8 @@ static inline void dbgPrint([[maybe_unused]] char const *fmt, #define dbgPrintFunc() dbgPrint("%s", __func__) -constexpr std::uint32_t fourCC(std::byte a, std::byte b, std::byte c, std::byte d) +constexpr +std::uint32_t fourCC(std::byte a, std::byte b, std::byte c, std::byte d) { return (a << 24) | (b << 16) | (c << 8) | d; }