Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ogre-binary

Browse Source
This commit is contained in:
Jonne Nauha
2014-05-21 04:55:09 +03:00
parent 6ba2a8bce9 279a97872a
commit 8a5041ea11
9 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssimpPCH.cpp
View File

@@ -63,7 +63,7 @@ ASSIMP_API unsigned int aiGetCompileFlags () {
}
// include current build revision, which is even updated from time to time -- :-)
#include "../revision.h"
#include "revision.h"
// ------------------------------------------------------------------------------------------------
ASSIMP_API unsigned int aiGetVersionRevision ()

2
code/BoostWorkaround/boost/shared_array.hpp
View File

@@ -2,7 +2,7 @@
#ifndef INCLUDED_AI_BOOST_SHARED_ARRAY
#define INCLUDED_AI_BOOST_SHARED_ARRAY
#ifndef BOOST_SCOPED_ARRAY_HPP_INCLUDED
#ifndef BOOST_SHARED_ARRAY_HPP_INCLUDED
// ------------------------------
// Internal stub

4
code/BoostWorkaround/boost/shared_ptr.hpp
View File

@@ -2,7 +2,7 @@
#ifndef INCLUDED_AI_BOOST_SHARED_PTR
#define INCLUDED_AI_BOOST_SHARED_PTR
#ifndef BOOST_SCOPED_PTR_HPP_INCLUDED
#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
// ------------------------------
// Internal stub
@@ -254,4 +254,4 @@ inline shared_ptr<T> const_pointer_cast( shared_ptr<U> ptr)
#else
# error "shared_ptr.h was already included"
#endif
#endif // INCLUDED_AI_BOOST_SCOPED_PTR
#endif // INCLUDED_AI_BOOST_SHARED_PTR