diff options
author | Mike Krus <mike.krus@kdab.com> | 2018-04-04 09:53:27 +0100 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2018-04-09 11:51:08 +0000 |
commit | 5247d7146c65672bd245ceb0dc213dfb319919c4 (patch) | |
tree | 87159d0f24af725bb7c01c7495d71b3cc4bc76c2 /src/3rdparty/assimp/include/assimp/vector2.inl | |
parent | af4972fd15e6b11a99c631ff91b3360ceb8be5cc (diff) |
Update Assimp to 4.1
Fixes build with C++17 / XCode 9.3
Change-Id: Ic1c19cc4b86e54e72dd4cfe054ec6d66f64b5a07
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/3rdparty/assimp/include/assimp/vector2.inl')
-rw-r--r-- | src/3rdparty/assimp/include/assimp/vector2.inl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/3rdparty/assimp/include/assimp/vector2.inl b/src/3rdparty/assimp/include/assimp/vector2.inl index ae823fc1a..5ce13eece 100644 --- a/src/3rdparty/assimp/include/assimp/vector2.inl +++ b/src/3rdparty/assimp/include/assimp/vector2.inl @@ -3,7 +3,8 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2016, assimp team +Copyright (c) 2006-2017, assimp team + All rights reserved. @@ -42,6 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file vector2.inl * @brief Inline implementation of aiVector2t<TReal> operators */ +#pragma once #ifndef AI_VECTOR2D_INL_INC #define AI_VECTOR2D_INL_INC @@ -221,4 +223,5 @@ inline aiVector2t<TReal> operator - ( const aiVector2t<TReal>& v) } #endif -#endif + +#endif // AI_VECTOR2D_INL_INC |