v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1385 from gongminmin/FixForVS2017.3 

Fix compiling problems under VS2017.3.
pull/1397/head
Kim Kulling 2017-08-15 21:27:38 +02:00 committed by GitHub
parent dab0985994 b26fea4cf5
commit 6b4e3177e8
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -148,6 +148,12 @@ find_package(OpenMP)
if (OPENMP_FOUND) if (OPENMP_FOUND)
SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
IF(MSVC)
IF(MSVC_VERSION GREATER 1910)
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:twoPhase-")
ENDIF()
ENDIF()
endif() endif()
CONFIGURE_FILE( CONFIGURE_FILE(

4
code/X3DImporter.cpp
View File

@ -95,8 +95,8 @@ struct WordIterator: public std::iterator<std::input_iterator_tag, const char*>
end_ = other.end_; end_ = other.end_;
return *this; return *this;
} }
bool operator==(WordIterator &other) const { return start_ == other.start_; } bool operator==(const WordIterator &other) const { return start_ == other.start_; }
bool operator!=(WordIterator &other) const { return start_ != other.start_; } bool operator!=(const WordIterator &other) const { return start_ != other.start_; }
WordIterator &operator++() { WordIterator &operator++() {
start_ += strcspn(start_, whitespace); start_ += strcspn(start_, whitespace);
start_ += strspn(start_, whitespace); start_ += strspn(start_, whitespace);