diff options
author | McCabe Maxsted | 2009-11-07 19:34:35 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-11-07 19:34:35 -0700 |
commit | f6e759acb43649e278327a6b6a8a83fbf9af3fe5 (patch) | |
tree | ec109872f6a9e9e9ee97203373cff367da88414b /linden/indra/llmath/llcalc.cpp | |
parent | Upped version to 1.2.0 RC1 (diff) | |
download | meta-impy-f6e759acb43649e278327a6b6a8a83fbf9af3fe5.zip meta-impy-f6e759acb43649e278327a6b6a8a83fbf9af3fe5.tar.gz meta-impy-f6e759acb43649e278327a6b6a8a83fbf9af3fe5.tar.bz2 meta-impy-f6e759acb43649e278327a6b6a8a83fbf9af3fe5.tar.xz |
Check for different versions of boost in build math files (also fixes broken build math functions)
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llmath/llcalc.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/llmath/llcalc.cpp b/linden/indra/llmath/llcalc.cpp index 526a116..74f9544 100644 --- a/linden/indra/llmath/llcalc.cpp +++ b/linden/indra/llmath/llcalc.cpp | |||
@@ -11,8 +11,14 @@ | |||
11 | 11 | ||
12 | #include "llcalc.h" | 12 | #include "llcalc.h" |
13 | 13 | ||
14 | #include <boost/version.hpp> | ||
15 | #if BOOST_VERSION >= 103600 | ||
16 | #include <boost/spirit/include/classic_core.hpp> | ||
17 | #include <boost/spirit/include/classic_error_handling.hpp> | ||
18 | #else | ||
14 | #include <boost/spirit/core.hpp> | 19 | #include <boost/spirit/core.hpp> |
15 | #include <boost/spirit/error_handling.hpp> | 20 | #include <boost/spirit/error_handling.hpp> |
21 | #endif | ||
16 | 22 | ||
17 | #include "llcalcparser.h" | 23 | #include "llcalcparser.h" |
18 | #include "llmath.h" | 24 | #include "llmath.h" |