diff options
Diffstat (limited to 'src/3rdparty/assimp/code/FBXUtil.h')
| -rw-r--r-- | src/3rdparty/assimp/code/FBXUtil.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/3rdparty/assimp/code/FBXUtil.h b/src/3rdparty/assimp/code/FBXUtil.h index a205b598d..bd41834b0 100644 --- a/src/3rdparty/assimp/code/FBXUtil.h +++ b/src/3rdparty/assimp/code/FBXUtil.h @@ -2,11 +2,11 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2012, assimp team +Copyright (c) 2006-2016, assimp team All rights reserved. -Redistribution and use of this software in source and binary forms, -with or without modification, are permitted provided that the +Redistribution and use of this software in source and binary forms, +with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above @@ -23,16 +23,16 @@ following conditions are met: derived from this software without specific prior written permission of the assimp team. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------- @@ -59,9 +59,9 @@ namespace Util { template<typename T> struct delete_fun { - void operator()(const volatile T* del) { - delete del; - } + void operator()(const volatile T* del) { + delete del; + } }; /** Get a string representation for a #TokenType. */ @@ -74,7 +74,7 @@ const char* TokenTypeString(TokenType t); * @param prefix Message prefix to be preprended to the location info. * @param text Message text * @param line Line index, 1-based - * @param column Colum index, 1-based + * @param column Column index, 1-based * @return A string of the following format: {prefix} (offset 0x{offset}) {text}*/ std::string AddOffset(const std::string& prefix, const std::string& text, unsigned int offset); @@ -84,10 +84,10 @@ std::string AddOffset(const std::string& prefix, const std::string& text, unsign * @param prefix Message prefix to be preprended to the location info. * @param text Message text * @param line Line index, 1-based - * @param column Colum index, 1-based + * @param column Column index, 1-based * @return A string of the following format: {prefix} (line {line}, col {column}) {text}*/ std::string AddLineAndColumn(const std::string& prefix, const std::string& text, unsigned int line, unsigned int column); - + /** Format log/error messages using a given cursor token. * |