From c571b92dd7b770e3bdbe7a219f682be255c5f308 Mon Sep 17 00:00:00 2001
From: Paul Holland <pholland@adobe.com>
Date: Thu, 28 Jan 2016 08:06:52 -0800
Subject: [PATCH 1/2] bug fix

---
 .../openddlparser/include/openddlparser/OpenDDLParserUtils.h    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/openddlparser/include/openddlparser/OpenDDLParserUtils.h b/contrib/openddlparser/include/openddlparser/OpenDDLParserUtils.h
index 635dfd8f7..8245f15b6 100644
--- a/contrib/openddlparser/include/openddlparser/OpenDDLParserUtils.h
+++ b/contrib/openddlparser/include/openddlparser/OpenDDLParserUtils.h
@@ -243,7 +243,7 @@ bool isComment( T *in, T *end ) {
         if ( in+1!=end ) {
             if ( *( in+1 )=='/' ) {
                 char *drive( ( in+2 ) );
-                if ( isUpperCase<T>( *drive )||isLowerCase<T>( *drive )&&*( drive+1 )=='/' )  {
+                if ( (isUpperCase<T>( *drive )||isLowerCase<T>( *drive ))&&*( drive+1 )=='/' )  {
                     return false;
                 } else {
                     return true;

From f20a5afcf06a467b5a5a884d4bcfd38dc9c6bb32 Mon Sep 17 00:00:00 2001
From: Paul Holland <pholland@adobe.com>
Date: Thu, 18 Feb 2016 12:17:47 -0800
Subject: [PATCH 2/2] can't add integer to string pointer

---
 code/ColladaParser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/ColladaParser.cpp b/code/ColladaParser.cpp
index f52ec677a..f620f7acb 100644
--- a/code/ColladaParser.cpp
+++ b/code/ColladaParser.cpp
@@ -297,7 +297,7 @@ void ColladaParser::ReadAnimationClipLibrary()
 				else if (indexID >= 0)
 					animName = mReader->getAttributeValue(indexID);
 				else
-					animName = "animation_" + mAnimationClipLibrary.size();
+					animName = std::string("animation_") + std::to_string(mAnimationClipLibrary.size());
 
 				std::pair<std::string, std::vector<std::string> > clip;