livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash in LLCalc::evalString, see FIRE-4381.

Nicky 2012-03-29 19:39:07 +02:00
parent 14df45c313
commit be8136be19
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmath/llcalcparser.h
View File

@ -27,6 +27,8 @@
#ifndef LL_CALCPARSER_H
#define LL_CALCPARSER_H
#define BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE
#include <boost/spirit/include/classic_attribute.hpp>
#include <boost/spirit/include/classic_core.hpp>
#include <boost/spirit/include/classic_error_handling.hpp>

1
indra/newview/fslslpreproc.cpp
View File

@ -110,6 +110,7 @@ std::map<std::string,LLUUID> FSLSLPreprocessor::cached_assetids;
#ifdef LL_WINDOWS
#pragma warning (disable : 4702) // warning C4702: unreachable code
#endif
#define BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE
#include <boost/assert.hpp>
#include <boost/wave.hpp>