diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-23 08:43:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 08:43:18 +0100 |
| commit | bd10c7045865bc7788f695b3ecc4fb136a499d87 (patch) | |
| tree | 17b378d5698fe51bcd2e67aa648e704b29427b88 /core/packed_data_container.cpp | |
| parent | 63b0d822d109f3612d5c22e4342ebef9cd3b9163 (diff) | |
| parent | 2cf6ac6c507529884d6b8acfdc42f3bc1826b19d (diff) | |
Merge pull request #36461 from akien-mga/c++17-fallthrough-attribute
Replace FALLTHROUGH macro by C++17 [[fallthrough]]
Diffstat (limited to 'core/packed_data_container.cpp')
| -rw-r--r-- | core/packed_data_container.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/packed_data_container.cpp b/core/packed_data_container.cpp index f23ee30a27..6a4fac971c 100644 --- a/core/packed_data_container.cpp +++ b/core/packed_data_container.cpp @@ -225,8 +225,8 @@ uint32_t PackedDataContainer::_pack(const Variant &p_data, Vector<uint8_t> &tmpd string_cache[s] = tmpdata.size(); - FALLTHROUGH; - }; + [[fallthrough]]; + } case Variant::NIL: case Variant::BOOL: case Variant::INT: |