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

Fix for FIRE-6119 (Spinners broken after preprocessor merge). Please test for linux/mac breakage on preproc, chatbar_as_cmdline's calc command and math in spinners.

Liny 2012-04-23 18:53:21 -07:00
parent 802270f206
commit 34d223148f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmath/llcalcparser.h
View File

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

2
indra/newview/fslslpreproc.cpp
View File

@ -110,7 +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
//#define BOOST_SPIRIT_THREADSAFE
#include <boost/assert.hpp>
#include <boost/wave.hpp>