summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerror.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-08-14 16:10:17 -0700
committerRichard Linden <none@none>2013-08-14 16:10:17 -0700
commitbceb1e8abe916cd69e7ac6ab70dc03dc6d76c9df (patch)
tree0016163049097d6b55a065b8fafdc609f1879c54 /indra/llcommon/llerror.h
parent52086d4485e004999d097cb66fb5cf63e34203d2 (diff)
parent26581404e426b00cd0a07c38b5cb858d5d5faa28 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/llerror.h')
-rwxr-xr-xindra/llcommon/llerror.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index 7810676388..a3619559eb 100755
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -308,7 +308,7 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
#define lllog(level, once, ...) \
do { \
const char* tags[] = {"", ##__VA_ARGS__}; \
- size_t tag_count = LL_ARRAY_SIZE(tags) - 1; \
+ ::size_t tag_count = LL_ARRAY_SIZE(tags) - 1; \
static LLError::CallSite _site( \
level, __FILE__, __LINE__, typeid(_LL_CLASS_TO_LOG), __FUNCTION__, once, &tags[1], tag_count);\
if (LL_UNLIKELY(_site.shouldLog())) \