File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -149,6 +149,7 @@ pre_build()
149149 RELEASE_CRASH_REPORTING=OFF
150150 HAVOK=OFF
151151 TESTING=OFF
152+ USE_LTO=ON
152153 SIGNING=()
153154 if [[ " $variant " != * OS ]]
154155 then
@@ -170,6 +171,7 @@ pre_build()
170171 # RELEASE_CRASH_REPORTING is tuned on unconditionaly, this is fine but not for Linux as of now (due to missing breakpad/crashpad support)
171172 RELEASE_CRASH_REPORTING=OFF
172173 HAVOK=OFF
174+ USE_LTO=OFF
173175 fi
174176
175177 if $build_tests
@@ -202,6 +204,7 @@ pre_build()
202204 " $autobuild " configure --quiet -c $variant \
203205 ${eval_autobuild_configure_parameters:- --} \
204206 -DLL_TESTS:BOOL=" $TESTING " \
207+ -DUSE_LTO:BOOL=" $USE_LTO " \
205208 -DPACKAGE:BOOL=ON \
206209 -DHAVOK:BOOL=" $HAVOK " \
207210 -DRELEASE_CRASH_REPORTING:BOOL=" $RELEASE_CRASH_REPORTING " \
Original file line number Diff line number Diff line change @@ -503,7 +503,7 @@ bool filter_llsd_with_template(
503503* Helpers for llsd_matches()
504504*****************************************************************************/
505505// raw data used for LLSD::Type lookup
506- struct Data
506+ struct LLSDData
507507{
508508 LLSD ::Type type;
509509 const char * name;
@@ -534,7 +534,7 @@ class TypeLookup
534534 {
535535 LL_PROFILE_ZONE_SCOPED ;
536536
537- for (const Data *di (boost::begin (typedata)), *dend (boost::end (typedata)); di != dend; ++di)
537+ for (const LLSDData *di (boost::begin (typedata)), *dend (boost::end (typedata)); di != dend; ++di)
538538 {
539539 mMap [di->type ] = di->name ;
540540 }
You can’t perform that action at this time.
0 commit comments