aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/llsd.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llcommon/llsd.cpp')
-rw-r--r--linden/indra/llcommon/llsd.cpp20
1 files changed, 20 insertions, 0 deletions
diff --git a/linden/indra/llcommon/llsd.cpp b/linden/indra/llcommon/llsd.cpp
index 305531b..829ea25 100644
--- a/linden/indra/llcommon/llsd.cpp
+++ b/linden/indra/llcommon/llsd.cpp
@@ -36,11 +36,23 @@
36#include "../llmath/llmath.h" 36#include "../llmath/llmath.h"
37#include "llformat.h" 37#include "llformat.h"
38 38
39#ifndef LL_RELEASE_FOR_DOWNLOAD
40#define NAME_UNNAMED_NAMESPACE
41#endif
42
43#ifdef NAME_UNNAMED_NAMESPACE
44namespace LLSDUnnamedNamespace {
45#else
39namespace { 46namespace {
47#endif
40 class ImplMap; 48 class ImplMap;
41 class ImplArray; 49 class ImplArray;
42} 50}
43 51
52#ifdef NAME_UNNAMED_NAMESPACE
53using namespace LLSDUnnamedNamespace;
54#endif
55
44class LLSD::Impl 56class LLSD::Impl
45 /**< This class is the abstract base class of the implementation of LLSD 57 /**< This class is the abstract base class of the implementation of LLSD
46 It provides the reference counting implementation, and the default 58 It provides the reference counting implementation, and the default
@@ -125,7 +137,11 @@ public:
125 static U32 sOutstandingCount; 137 static U32 sOutstandingCount;
126}; 138};
127 139
140#ifdef NAME_UNNAMED_NAMESPACE
141namespace LLSDUnnamedNamespace {
142#else
128namespace { 143namespace {
144#endif
129 template<LLSD::Type T, class Data, class DataRef = Data> 145 template<LLSD::Type T, class Data, class DataRef = Data>
130 class ImplBase : public LLSD::Impl 146 class ImplBase : public LLSD::Impl
131 ///< This class handles most of the work for a subclass of Impl 147 ///< This class handles most of the work for a subclass of Impl
@@ -632,7 +648,11 @@ U32 LLSD::Impl::sOutstandingCount = 0;
632 648
633 649
634 650
651#ifdef NAME_UNNAMED_NAMESPACE
652namespace LLSDUnnamedNamespace {
653#else
635namespace { 654namespace {
655#endif
636 inline LLSD::Impl& safe(LLSD::Impl* impl) 656 inline LLSD::Impl& safe(LLSD::Impl* impl)
637 { return LLSD::Impl::safe(impl); } 657 { return LLSD::Impl::safe(impl); }
638 658