From cb282c6ef0bb91957f8a6f422705813bd47c788c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 17 Mar 2020 07:33:00 +0100 Subject: Style: Set clang-format Standard to Cpp11 For us, it practically only changes the fact that `A>` is now used instead of the C++03 compatible `A >`. Note: clang-format 10+ changed the `Standard` arguments to fully specified `c++11`, `c++14`, etc. versions, but we can't use `c++17` now if we want to preserve compatibility with clang-format 8 and 9. `Cpp11` is still supported as deprecated alias for `Latest`. --- core/variant.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'core/variant.cpp') diff --git a/core/variant.cpp b/core/variant.cpp index b82602a5a4..d12a15ec9d 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -2325,31 +2325,31 @@ inline DA _convert_array_from_variant(const Variant &p_variant) { return _convert_array(p_variant.operator Array()); } case Variant::PACKED_BYTE_ARRAY: { - return _convert_array >(p_variant.operator Vector()); + return _convert_array>(p_variant.operator Vector()); } case Variant::PACKED_INT32_ARRAY: { - return _convert_array >(p_variant.operator Vector()); + return _convert_array>(p_variant.operator Vector()); } case Variant::PACKED_INT64_ARRAY: { - return _convert_array >(p_variant.operator Vector()); + return _convert_array>(p_variant.operator Vector()); } case Variant::PACKED_FLOAT32_ARRAY: { - return _convert_array >(p_variant.operator Vector()); + return _convert_array>(p_variant.operator Vector()); } case Variant::PACKED_FLOAT64_ARRAY: { - return _convert_array >(p_variant.operator Vector()); + return _convert_array>(p_variant.operator Vector()); } case Variant::PACKED_STRING_ARRAY: { - return _convert_array >(p_variant.operator Vector()); + return _convert_array>(p_variant.operator Vector()); } case Variant::PACKED_VECTOR2_ARRAY: { - return _convert_array >(p_variant.operator Vector()); + return _convert_array>(p_variant.operator Vector()); } case Variant::PACKED_VECTOR3_ARRAY: { - return _convert_array >(p_variant.operator Vector()); + return _convert_array>(p_variant.operator Vector()); } case Variant::PACKED_COLOR_ARRAY: { - return _convert_array >(p_variant.operator Vector()); + return _convert_array>(p_variant.operator Vector()); } default: { return DA(); @@ -2370,21 +2370,21 @@ Variant::operator Vector() const { if (type == PACKED_BYTE_ARRAY) return static_cast *>(_data.packed_array)->array; else - return _convert_array_from_variant >(*this); + return _convert_array_from_variant>(*this); } Variant::operator Vector() const { if (type == PACKED_INT32_ARRAY) return static_cast *>(_data.packed_array)->array; else - return _convert_array_from_variant >(*this); + return _convert_array_from_variant>(*this); } Variant::operator Vector() const { if (type == PACKED_INT64_ARRAY) return static_cast *>(_data.packed_array)->array; else - return _convert_array_from_variant >(*this); + return _convert_array_from_variant>(*this); } Variant::operator Vector() const { @@ -2392,7 +2392,7 @@ Variant::operator Vector() const { if (type == PACKED_FLOAT32_ARRAY) return static_cast *>(_data.packed_array)->array; else - return _convert_array_from_variant >(*this); + return _convert_array_from_variant>(*this); } Variant::operator Vector() const { @@ -2400,7 +2400,7 @@ Variant::operator Vector() const { if (type == PACKED_FLOAT64_ARRAY) return static_cast *>(_data.packed_array)->array; else - return _convert_array_from_variant >(*this); + return _convert_array_from_variant>(*this); } Variant::operator Vector() const { @@ -2408,21 +2408,21 @@ Variant::operator Vector() const { if (type == PACKED_STRING_ARRAY) return static_cast *>(_data.packed_array)->array; else - return _convert_array_from_variant >(*this); + return _convert_array_from_variant>(*this); } Variant::operator Vector() const { if (type == PACKED_VECTOR3_ARRAY) return static_cast *>(_data.packed_array)->array; else - return _convert_array_from_variant >(*this); + return _convert_array_from_variant>(*this); } Variant::operator Vector() const { if (type == PACKED_VECTOR2_ARRAY) return static_cast *>(_data.packed_array)->array; else - return _convert_array_from_variant >(*this); + return _convert_array_from_variant>(*this); } Variant::operator Vector() const { @@ -2430,7 +2430,7 @@ Variant::operator Vector() const { if (type == PACKED_COLOR_ARRAY) return static_cast *>(_data.packed_array)->array; else - return _convert_array_from_variant >(*this); + return _convert_array_from_variant>(*this); } /* helpers */ -- cgit v1.2.3