From 6a736d2c8e99ce857dab5d8c18bb91b3ad4df065 Mon Sep 17 00:00:00 2001 From: Sean Parent Date: Wed, 8 Jan 2025 15:29:53 -0800 Subject: [PATCH] git clang-format --- CMakePresets.json | 277 +++++++++--------- source/eve.cpp | 3 +- test/copy_on_write/cow_test.cpp | 4 +- .../expression_parser_test.cpp | 4 +- 4 files changed, 148 insertions(+), 140 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 32ba2461..518b2354 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -1,139 +1,146 @@ { - "version": 3, - "configurePresets": [ - { - "name": "debug", - "displayName": "debug-windows", - "description": "Sets Ninja generator, build and install directory", - "generator": "Ninja", - "binaryDir": "${sourceDir}/../build/asl-${presetName}", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "DEBUG", - "CMAKE_CXX_STANDARD": "20", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}" - }, - "architecture": { - "value": "x64", - "strategy": "external" - }, - "vendor": { - "microsoft.com/VisualStudioSettings/CMake/1.0": { - "hostOS": ["Windows"] + "version": 3, + "configurePresets": [ + { + "name": "debug", + "displayName": "debug-windows", + "description": "Sets Ninja generator, build and install directory", + "generator": "Ninja", + "binaryDir": "${sourceDir}/../build/asl-${presetName}", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "DEBUG", + "CMAKE_CXX_STANDARD": "20", + "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}" + }, + "architecture": { + "value": "x64", + "strategy": "external" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "hostOS": [ + "Windows" + ] + } + } + }, + { + "name": "wd17", + "displayName": "windows-debug-C++17", + "description": "Sets Ninja generator, build and install directory", + "generator": "Ninja", + "binaryDir": "${sourceDir}/../build/asl-${presetName}", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "DEBUG", + "CMAKE_CXX_STANDARD": "17", + "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}" + }, + "architecture": { + "value": "x64", + "strategy": "external" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "hostOS": [ + "Windows" + ] + } + } + }, + { + "name": "macos-debug-C++20", + "displayName": "macos-debug-C++20", + "description": "Sets Ninja generator, build and install directory", + "generator": "Ninja", + "binaryDir": "${sourceDir}/../build/asl-${presetName}", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "DEBUG", + "CMAKE_CXX_STANDARD": "20", + "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "hostOS": [ + "macOS" + ] + } + } + }, + { + "name": "macos-debug-C++17", + "displayName": "macos-debug-C++17", + "description": "Sets Ninja generator, build and install directory", + "generator": "Ninja", + "binaryDir": "${sourceDir}/../build/asl-${presetName}", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "DEBUG", + "CMAKE_CXX_STANDARD": "17" + } + }, + { + "name": "clang-tidy-base", + "hidden": true, + "generator": "Ninja", + "binaryDir": "${sourceDir}/../build/asl-${presetName}", + "cacheVariables": { + "CMAKE_CXX_STANDARD": "17", + "CMAKE_BUILD_TYPE": "DEBUG", + "CMAKE_CXX_CLANG_TIDY": "clang-tidy" + } + }, + { + "name": "windows-clang-tidy-nofix", + "inherits": "clang-tidy-base", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + }, + "cacheVariables": { + "CMAKE_CXX_CLANG_TIDY": "clang-tidy;--extra-arg=/EHsc;--extra-arg=/DNOMINMAX" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "enableMicrosoftCodeAnalysis": true + } + } + }, + { + "name": "clang-tidy-fix", + "hidden": false, + "generator": "Ninja", + "binaryDir": "${sourceDir}/../build/asl-${presetName}", + "cacheVariables": { + "CMAKE_CXX_STANDARD": "17", + "CMAKE_BUILD_TYPE": "DEBUG", + "CMAKE_CXX_CLANG_TIDY": + "clang-tidy;--fix;--allow-no-checks;--extra-arg=/EHsc;--extra-arg=/DNOMINMAX" + } + }, + { + "name": "clang-tidy-nofix", + "hidden": false, + "generator": "Ninja", + "binaryDir": "${sourceDir}/../build/asl-${presetName}", + "cacheVariables": { + "CMAKE_CXX_STANDARD": "17", + "CMAKE_BUILD_TYPE": "DEBUG", + "CMAKE_CXX_CLANG_TIDY": "clang-tidy;--extra-arg=/EHsc;--extra-arg=/DNOMINMAX" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "enableMicrosoftCodeAnalysis": true, + "enableClangTidyCodeAnalysis": true + } + } } - } - }, - { - "name": "wd17", - "displayName": "windows-debug-C++17", - "description": "Sets Ninja generator, build and install directory", - "generator": "Ninja", - "binaryDir": "${sourceDir}/../build/asl-${presetName}", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "DEBUG", - "CMAKE_CXX_STANDARD": "17", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}" - }, - "architecture": { - "value": "x64", - "strategy": "external" - }, - "vendor": { - "microsoft.com/VisualStudioSettings/CMake/1.0": { - "hostOS": ["Windows"] + ], + "buildPresets": [ + { + "name": "debug-windows", + "description": "", + "displayName": "", + "configurePreset": "debug" } - } - }, - { - "name": "macos-debug-C++20", - "displayName": "macos-debug-C++20", - "description": "Sets Ninja generator, build and install directory", - "generator": "Ninja", - "binaryDir": "${sourceDir}/../build/asl-${presetName}", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "DEBUG", - "CMAKE_CXX_STANDARD": "20", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}" - }, - "vendor": { - "microsoft.com/VisualStudioSettings/CMake/1.0": { - "hostOS": ["macOS"] - } - } - }, - { - "name": "macos-debug-C++17", - "displayName": "macos-debug-C++17", - "description": "Sets Ninja generator, build and install directory", - "generator": "Ninja", - "binaryDir": "${sourceDir}/../build/asl-${presetName}", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "DEBUG", - "CMAKE_CXX_STANDARD": "17" - } - }, - { - "name": "clang-tidy-base", - "hidden": true, - "generator": "Ninja", - "binaryDir": "${sourceDir}/../build/asl-${presetName}", - "cacheVariables": { - "CMAKE_CXX_STANDARD": "17", - "CMAKE_BUILD_TYPE": "DEBUG", - "CMAKE_CXX_CLANG_TIDY": "clang-tidy" - } - }, - { - "name": "windows-clang-tidy-nofix", - "inherits": "clang-tidy-base", - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - }, - "cacheVariables": { - "CMAKE_CXX_CLANG_TIDY": "clang-tidy;--extra-arg=/EHsc;--extra-arg=/DNOMINMAX" - }, - "vendor": { - "microsoft.com/VisualStudioSettings/CMake/1.0": { - "enableMicrosoftCodeAnalysis": true - } - } - }, - { - "name": "clang-tidy-fix", - "hidden": false, - "generator": "Ninja", - "binaryDir": "${sourceDir}/../build/asl-${presetName}", - "cacheVariables": { - "CMAKE_CXX_STANDARD": "17", - "CMAKE_BUILD_TYPE": "DEBUG", - "CMAKE_CXX_CLANG_TIDY": "clang-tidy;--fix;--allow-no-checks;--extra-arg=/EHsc;--extra-arg=/DNOMINMAX" - } - }, - { - "name": "clang-tidy-nofix", - "hidden": false, - "generator": "Ninja", - "binaryDir": "${sourceDir}/../build/asl-${presetName}", - "cacheVariables": { - "CMAKE_CXX_STANDARD": "17", - "CMAKE_BUILD_TYPE": "DEBUG", - "CMAKE_CXX_CLANG_TIDY": "clang-tidy;--extra-arg=/EHsc;--extra-arg=/DNOMINMAX" - }, - "vendor": { - "microsoft.com/VisualStudioSettings/CMake/1.0": { - "enableMicrosoftCodeAnalysis": true, - "enableClangTidyCodeAnalysis": true - } - } - } - ], - "buildPresets": [ - { - "name": "debug-windows", - "description": "", - "displayName": "", - "configurePreset": "debug" - } - ] + ] } diff --git a/source/eve.cpp b/source/eve.cpp index 30ad5b09..77a1fd44 100644 --- a/source/eve.cpp +++ b/source/eve.cpp @@ -912,7 +912,8 @@ void view_proxy_t::layout_with(::child_iterator first, ::child_iterator last, */ if (iter_gslice.alignment_m == adobe::layout_attributes_t::align_reverse_fill) { - ADOBE_ASSERT(padded_count && "align_reverse_fill item not accounted for in padded_count."); + ADOBE_ASSERT(padded_count && + "align_reverse_fill item not accounted for in padded_count."); int additional_length(remaining_additional_length / padded_count); --padded_count; diff --git a/test/copy_on_write/cow_test.cpp b/test/copy_on_write/cow_test.cpp index c709702e..d39225f3 100644 --- a/test/copy_on_write/cow_test.cpp +++ b/test/copy_on_write/cow_test.cpp @@ -151,7 +151,9 @@ void test_copy_on_write() { } // Test default constructor - { CowType value_0; } + { + CowType value_0; + } // Check if constexpr (is_noisy) { BOOST_CHECK_MESSAGE(noisy_check_allocation() == 1, "allocation count mismatch"); diff --git a/test/expression_parser/expression_parser_test.cpp b/test/expression_parser/expression_parser_test.cpp index 0bc93d92..0f3ee61a 100644 --- a/test/expression_parser/expression_parser_test.cpp +++ b/test/expression_parser/expression_parser_test.cpp @@ -42,9 +42,7 @@ void exception_test(const char* const expression, const adobe::line_position_t& /**************************************************************************************************/ -BOOST_AUTO_TEST_CASE(expression_parser_configure_output) { - cerr << "CTEST_FULL_OUTPUT\n\n"; -} +BOOST_AUTO_TEST_CASE(expression_parser_configure_output) { cerr << "CTEST_FULL_OUTPUT\n\n"; } /**************************************************************************************************/