summaryrefslogtreecommitdiff
path: root/indra/llcommon/llpointer.h
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2012-08-03 14:49:49 -0400
committerMonty Brandenberg <monty@lindenlab.com>2012-08-03 14:49:49 -0400
commit0664cb1512481b9cd9f5ef4bc398c88416b246a9 (patch)
tree552a1d8207942c08ae379dfa916b2e5afcd3912e /indra/llcommon/llpointer.h
parentbf004be1023347bcabaae6baa1624b2ed78d69fd (diff)
parent7d98d1afb036ce4b221e101e6de153a3d978ba9f (diff)
Automated merge with ssh://hg.lindenlab.com/monty/viewer-drano-http
Diffstat (limited to 'indra/llcommon/llpointer.h')
-rw-r--r--indra/llcommon/llpointer.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcommon/llpointer.h b/indra/llcommon/llpointer.h
index affa040602..88c09c8dca 100644
--- a/indra/llcommon/llpointer.h
+++ b/indra/llcommon/llpointer.h
@@ -140,6 +140,10 @@ public:
}
protected:
+#ifdef LL_LIBRARY_INCLUDE
+ void ref();
+ void unref();
+#else
void ref()
{
if (mPointer)
@@ -162,7 +166,7 @@ protected:
}
}
}
-
+#endif
protected:
Type* mPointer;
};