From f65e5d5487f8d8d48f1513e700c1fae0a340fd05 Mon Sep 17 00:00:00 2001 From: Frederik Aalund Date: Sun, 9 Mar 2014 17:04:27 +0100 Subject: [PATCH] Fixed a compile error due to a >> expression in a nested template statement. --- code/FBXConverter.cpp | 12 ++++++------ code/FBXProperties.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp index 9a8edff45..1ac05aa17 100644 --- a/code/FBXConverter.cpp +++ b/code/FBXConverter.cpp @@ -782,17 +782,17 @@ private: bool parse_succeeded = false; // Interpret the property as a concrete type - if (const TypedProperty* interpreted = prop.second->As>()) + if (const TypedProperty* interpreted = prop.second->As >()) ss << interpreted->Value(); - else if (const TypedProperty* interpreted = prop.second->As>()) + else if (const TypedProperty* interpreted = prop.second->As >()) ss << interpreted->Value(); - else if (const TypedProperty* interpreted = prop.second->As>()) + else if (const TypedProperty* interpreted = prop.second->As >()) ss << interpreted->Value(); - else if (const TypedProperty* interpreted = prop.second->As>()) + else if (const TypedProperty* interpreted = prop.second->As >()) ss << interpreted->Value(); - else if (const TypedProperty* interpreted = prop.second->As>()) + else if (const TypedProperty* interpreted = prop.second->As >()) ss << interpreted->Value(); - else if (const TypedProperty* interpreted = prop.second->As>()) + else if (const TypedProperty* interpreted = prop.second->As >()) { aiVector3D v = interpreted->Value(); ss << v.x << ";" << v.y << ";" << v.z; diff --git a/code/FBXProperties.h b/code/FBXProperties.h index 68c67e01d..9219c3eea 100644 --- a/code/FBXProperties.h +++ b/code/FBXProperties.h @@ -101,7 +101,7 @@ private: }; -typedef std::fbx_unordered_map> DirectPropertyMap; +typedef std::fbx_unordered_map > DirectPropertyMap; typedef std::fbx_unordered_map PropertyMap; typedef std::fbx_unordered_map LazyPropertyMap;