From 9a47c3dd6d1f2e8dbea25e41064cc5ef2c075c3e Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sun, 11 Oct 2015 19:19:04 -1000 Subject: [PATCH] OS X fixes --- hecl/blender/BlenderConnection.hpp | 1 + hecl/extern/Athena | 2 +- hecl/lib/Frontend/Parser.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hecl/blender/BlenderConnection.hpp b/hecl/blender/BlenderConnection.hpp index fb5a721ad..2ca6df6db 100644 --- a/hecl/blender/BlenderConnection.hpp +++ b/hecl/blender/BlenderConnection.hpp @@ -17,6 +17,7 @@ #include #include #include +#include #include "HECL/HECL.hpp" #include diff --git a/hecl/extern/Athena b/hecl/extern/Athena index e6dedd0e6..418f3e763 160000 --- a/hecl/extern/Athena +++ b/hecl/extern/Athena @@ -1 +1 @@ -Subproject commit e6dedd0e6cd72117cc3b06ec1b42aec0371d5790 +Subproject commit 418f3e763fed8234ae1498c56dcd574bdd66b020 diff --git a/hecl/lib/Frontend/Parser.cpp b/hecl/lib/Frontend/Parser.cpp index f01145204..4b385013f 100644 --- a/hecl/lib/Frontend/Parser.cpp +++ b/hecl/lib/Frontend/Parser.cpp @@ -58,7 +58,7 @@ Parser::Token Parser::consumeToken() /* Check for numeric literal */ { char* strEnd; - float val = std::strtof(&*m_sourceIt, &strEnd); + float val = strtof(&*m_sourceIt, &strEnd); if (&*m_sourceIt != strEnd) { Parser::Token tok(TokenNumLiteral, getLocation());