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

Flip the check on _MSC_VER for using TR1 containers.

Browse Source
This commit is contained in:
Hill Ma
2021-04-13 11:15:52 -07:00
parent 182418e818
commit 4aa52b3af8
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/AssetLib/Step/STEPFile.h
View File

@@ -57,7 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable : 4127 4456 4245 4512 )
#endif // _MSC_VER
#endif // _MSC_VER
//
#if _MSC_VER > 1500 || (defined __GNUC___)
@@ -69,12 +69,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifdef ASSIMP_STEP_USE_UNORDERED_MULTIMAP
# include <unordered_map>
# if _MSC_VER > 1600
# define step_unordered_map unordered_map
# define step_unordered_multimap unordered_multimap
# else
# if defined(_MSC_VER) && _MSC_VER <= 1600
# define step_unordered_map tr1::unordered_map
# define step_unordered_multimap tr1::unordered_multimap
# else
# define step_unordered_map unordered_map
# define step_unordered_multimap unordered_multimap
# endif
#endif

10
code/AssetLib/Step/StepExporter.cpp
View File

@@ -75,12 +75,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifdef ASSIMP_STEP_USE_UNORDERED_MULTIMAP
# include <unordered_map>
# if _MSC_VER > 1600
# define step_unordered_map unordered_map
# define step_unordered_multimap unordered_multimap
# else
# if defined(_MSC_VER) && _MSC_VER <= 1600
# define step_unordered_map tr1::unordered_map
# define step_unordered_multimap tr1::unordered_multimap
# else
# define step_unordered_map unordered_map
# define step_unordered_multimap unordered_multimap
# endif
#endif
@@ -302,7 +302,7 @@ void StepExporter::WriteFile()
dv23.Normalize();
dv31.Normalize();
dv13.Normalize();
aiVector3D dvY = dv12;
aiVector3D dvX = dvY ^ dv13;
dvX.Normalize();