diff options
Diffstat (limited to 'linden/indra/llmath/llcalcparser.cpp')
-rw-r--r-- | linden/indra/llmath/llcalcparser.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/linden/indra/llmath/llcalcparser.cpp b/linden/indra/llmath/llcalcparser.cpp index 1546c09..df2bc09 100644 --- a/linden/indra/llmath/llcalcparser.cpp +++ b/linden/indra/llmath/llcalcparser.cpp | |||
@@ -11,6 +11,13 @@ | |||
11 | 11 | ||
12 | #include "llcalcparser.h" | 12 | #include "llcalcparser.h" |
13 | 13 | ||
14 | #include <boost/version.hpp> | ||
15 | #if BOOST_VERSION >= 103600 | ||
16 | using namespace boost::spirit::classic; | ||
17 | #else | ||
18 | using namespace boost::spirit; | ||
19 | #endif | ||
20 | |||
14 | F32 LLCalcParser::lookup(const std::string::iterator& start, const std::string::iterator& end) const | 21 | F32 LLCalcParser::lookup(const std::string::iterator& start, const std::string::iterator& end) const |
15 | { | 22 | { |
16 | LLCalc::calc_map_t::iterator iter; | 23 | LLCalc::calc_map_t::iterator iter; |
@@ -28,7 +35,7 @@ F32 LLCalcParser::lookup(const std::string::iterator& start, const std::string:: | |||
28 | else | 35 | else |
29 | { | 36 | { |
30 | // This should never happen! | 37 | // This should never happen! |
31 | boost::spirit::throw_(end, std::string("Missing constants table")); | 38 | throw_(end, std::string("Missing constants table")); |
32 | } | 39 | } |
33 | 40 | ||
34 | if (mVariables) | 41 | if (mVariables) |
@@ -40,6 +47,6 @@ F32 LLCalcParser::lookup(const std::string::iterator& start, const std::string:: | |||
40 | } | 47 | } |
41 | } | 48 | } |
42 | 49 | ||
43 | boost::spirit::throw_(end, std::string("Unknown symbol " + name)); | 50 | throw_(end, std::string("Unknown symbol " + name)); |
44 | return 0.f; | 51 | return 0.f; |
45 | } | 52 | } |