Skip to content

Commit

Permalink
git clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
@sean-parent
sean-parent committed Jan 8, 2025
1 parent 6dd8160 commit 6a736d2
Show file tree
Hide file tree
Showing 4 changed files with 148 additions and 140 deletions.
277 changes: 142 additions & 135 deletions CMakePresets.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
]
]
}
3 changes: 2 additions & 1 deletion source/eve.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion test/copy_on_write/cow_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 1 addition & 3 deletions test/expression_parser/expression_parser_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"; }

/**************************************************************************************************/

Expand Down

0 comments on commit 6a736d2

Please sign in to comment.