summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llerror.h5
-rw-r--r--indra/llcommon/llpointer.h5
2 files changed, 0 insertions, 10 deletions
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index b17b9ff21e..b6d560a121 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -239,17 +239,12 @@ namespace LLError
~CallSite();
-#ifdef LL_LIBRARY_INCLUDE
- bool shouldLog();
-#else // LL_LIBRARY_INCLUDE
bool shouldLog()
{
return mCached
? mShouldLog
: Log::shouldLog(*this);
}
- // this member function needs to be in-line for efficiency
-#endif // LL_LIBRARY_INCLUDE
void invalidate();
diff --git a/indra/llcommon/llpointer.h b/indra/llcommon/llpointer.h
index 71c955c4c5..1b2a961c40 100644
--- a/indra/llcommon/llpointer.h
+++ b/indra/llcommon/llpointer.h
@@ -189,10 +189,6 @@ public:
}
protected:
-#ifdef LL_LIBRARY_INCLUDE
- void ref();
- void unref();
-#else
void ref()
{
if (mPointer)
@@ -215,7 +211,6 @@ protected:
}
}
}
-#endif // LL_LIBRARY_INCLUDE
protected:
Type* mPointer;