summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/assimp/code/FBXTokenizer.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/assimp/code/FBXTokenizer.h')
-rw-r--r--src/3rdparty/assimp/code/FBXTokenizer.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/3rdparty/assimp/code/FBXTokenizer.h b/src/3rdparty/assimp/code/FBXTokenizer.h
index f9f1fb871..e00ff5b79 100644
--- a/src/3rdparty/assimp/code/FBXTokenizer.h
+++ b/src/3rdparty/assimp/code/FBXTokenizer.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -44,7 +45,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef INCLUDED_AI_FBX_TOKENIZER_H
#define INCLUDED_AI_FBX_TOKENIZER_H
-#include <memory>
#include "FBXCompileConfig.h"
#include <assimp/ai_assert.h>
#include <vector>
@@ -84,13 +84,10 @@ enum TokenType
* Offers iterator protocol. Tokens are immutable. */
class Token
{
-
private:
-
static const unsigned int BINARY_MARKER = static_cast<unsigned int>(-1);
public:
-
/** construct a textual token */
Token(const char* sbegin, const char* send, TokenType type, unsigned int line, unsigned int column);
@@ -100,13 +97,10 @@ public:
~Token();
public:
-
std::string StringContents() const {
return std::string(begin(),end());
}
-public:
-
bool IsBinary() const {
return column == BINARY_MARKER;
}