Skip to content

Commit 367b0c9

Browse files
committed
Fix ODR violation during LTO link
1 parent a875b1f commit 367b0c9

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

indra/llcommon/llsdutil.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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
}

0 commit comments

Comments
 (0)