From 6ce13be4cacc4595a97d660af6465459127594ea Mon Sep 17 00:00:00 2001 From: Username404 Date: Sun, 19 Sep 2021 21:37:53 +0200 Subject: [PATCH] Don't append CMAKE_CXX_COMPILER_ARCHITECTURE_ID to CPACK_SYSTEM_NAME + CPACK_TOPLEVEL_TAG, and remove a few newlines in ParseComponents.hpp --- CMakeLists.txt | 4 ++-- src/headers/parsing/ParseComponents.hpp | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aca8d4a..755d8ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -180,8 +180,8 @@ elseif(MINGW OR MSVC) set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/resources/${PROJECT_NAME}.ico") set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/resources/${PROJECT_NAME}.ico") set(CPACK_NSIS_DEFINES "RequestExecutionLevel highest") - set(CPACK_SYSTEM_NAME "Win32-${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}") - set(CPACK_TOPLEVEL_TAG "Win32-${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}") + set(CPACK_SYSTEM_NAME "Win32") + set(CPACK_TOPLEVEL_TAG "Win32") set(CPACK_NSIS_MODIFY_PATH ON) set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON) if (WIN32) diff --git a/src/headers/parsing/ParseComponents.hpp b/src/headers/parsing/ParseComponents.hpp index f20e7e6..7154735 100644 --- a/src/headers/parsing/ParseComponents.hpp +++ b/src/headers/parsing/ParseComponents.hpp @@ -88,13 +88,10 @@ public: inline size_t getCompCount() const { return subComponents.size(); } IS_PARSECOMPONENT inline void add(const T& component) { addComponent(component); }; IS_PARSECOMPONENT inline void addAll(const initializer_list& components) { addAllComponents(components); } - IS_PARSECOMPONENT - inline ParseTree& operator<<(const T& component) { add(component); return *this; } + IS_PARSECOMPONENT inline ParseTree& operator<<(const T& component) { add(component); return *this; } ParseTree(): subComponents() {}; - IS_PARSECOMPONENT - constexpr explicit ParseTree(const T& element): ParseTree() { addComponent(element); } - IS_PARSECOMPONENT - constexpr ParseTree(const initializer_list& elements): ParseTree() { addAllComponents(elements); } + IS_PARSECOMPONENT constexpr explicit ParseTree(const T& element): ParseTree() { addComponent(element); } + IS_PARSECOMPONENT constexpr ParseTree(const initializer_list& elements): ParseTree() { addAllComponents(elements); } ParseTree(const initializer_list& elements): ParseTree() { for_each(elements.begin(), elements.end(), [&](ParseComponent* component){ subComponents.emplace_back(component);