Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
4f9a5d05
Commit
4f9a5d05
authored
12 years ago
by
Richard Linden
Browse files
Options
Downloads
Patches
Plain Diff
fix for gcc compile errors
parent
ca2207bd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/llcommon/llapr.h
+2
-2
2 additions, 2 deletions
indra/llcommon/llapr.h
indra/llcommon/llunit.h
+1
-0
1 addition, 0 deletions
indra/llcommon/llunit.h
indra/newview/app_settings/logcontrol.xml
+0
-1
0 additions, 1 deletion
indra/newview/app_settings/logcontrol.xml
with
3 additions
and
3 deletions
indra/llcommon/llapr.h
+
2
−
2
View file @
4f9a5d05
...
...
@@ -249,7 +249,7 @@ class LL_COMMON_API LLAPRFile : boost::noncopyable
//*******************************************************************************************************************************
};
class
LLThreadLocalPointerBase
:
LLInstanceTracker
<
LLThreadLocalPointerBase
>
class
LLThreadLocalPointerBase
:
public
LLInstanceTracker
<
LLThreadLocalPointerBase
>
{
public:
LLThreadLocalPointerBase
()
...
...
@@ -331,7 +331,7 @@ class LLThreadLocalPointer : public LLThreadLocalPointerBase
LLThreadLocalPointer
(
const
LLThreadLocalPointer
<
T
>&
other
)
:
LLThreadLocalPointerBase
(
other
)
:
LLThreadLocalPointerBase
(
other
)
{
set
(
other
.
get
());
}
...
...
This diff is collapsed.
Click to expand it.
indra/llcommon/llunit.h
+
1
−
0
View file @
4f9a5d05
...
...
@@ -177,6 +177,7 @@ template<typename UNIT_TYPE, typename STORAGE_TYPE>
struct
LLUnitStrict
:
public
LLUnit
<
UNIT_TYPE
,
STORAGE_TYPE
>
{
typedef
LLUnitStrict
<
UNIT_TYPE
,
STORAGE_TYPE
>
self_t
;
typedef
typename
LLUnit
<
UNIT_TYPE
,
STORAGE_TYPE
>::
storage_t
storage_t
;
explicit
LLUnitStrict
(
storage_t
value
=
storage_t
())
:
LLUnit
(
value
)
...
...
This diff is collapsed.
Click to expand it.
indra/newview/app_settings/logcontrol.xml
+
0
−
1
View file @
4f9a5d05
...
...
@@ -42,7 +42,6 @@
</array>
<key>
tags
</key>
<array>
<string>
FastTimers
</string>
<!-- sample entry for debugging specific items
<string>Avatar</string>
<string>Voice</string>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment