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
b0ba682e
Commit
b0ba682e
authored
4 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
We haz c++11 now, do make comments happen
parent
1ca3d4eb
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/llcommon/llhandle.h
+1
-1
1 addition, 1 deletion
indra/llcommon/llhandle.h
indra/llcommon/llpounceable.h
+1
-2
1 addition, 2 deletions
indra/llcommon/llpounceable.h
indra/newview/llmediadataclient.cpp
+0
-1
0 additions, 1 deletion
indra/newview/llmediadataclient.cpp
with
2 additions
and
4 deletions
indra/llcommon/llhandle.h
+
1
−
1
View file @
b0ba682e
...
@@ -272,7 +272,7 @@ class LLCheckedHandle: public LLCheckedHandleBase
...
@@ -272,7 +272,7 @@ class LLCheckedHandle: public LLCheckedHandleBase
* Converts the LLCheckedHandle to a bool. Allows for if (chkdHandle) {}
* Converts the LLCheckedHandle to a bool. Allows for if (chkdHandle) {}
* Does not throw.
* Does not throw.
*/
*/
/*
explicit
*/
operator
bool
()
const
// explicit conversion operator not available with Linux compiler
explicit
operator
bool
()
const
// explicit conversion operator not available with Linux compiler
{
{
return
(
mHandle
.
get
()
!=
NULL
);
return
(
mHandle
.
get
()
!=
NULL
);
}
}
...
...
This diff is collapsed.
Click to expand it.
indra/llcommon/llpounceable.h
+
1
−
2
View file @
b0ba682e
...
@@ -162,8 +162,7 @@ class LLPounceable: public boost::noncopyable
...
@@ -162,8 +162,7 @@ class LLPounceable: public boost::noncopyable
operator
T
()
const
{
return
mHeld
;
}
operator
T
()
const
{
return
mHeld
;
}
typename
boost
::
remove_pointer
<
T
>::
type
operator
*
()
const
{
return
*
mHeld
;
}
typename
boost
::
remove_pointer
<
T
>::
type
operator
*
()
const
{
return
*
mHeld
;
}
typename
boost
::
call_traits
<
T
>::
value_type
operator
->
()
const
{
return
mHeld
;
}
typename
boost
::
call_traits
<
T
>::
value_type
operator
->
()
const
{
return
mHeld
;
}
// uncomment 'explicit' as soon as we allow C++11 compilation
explicit
operator
bool
()
const
{
return
bool
(
mHeld
);
}
/*explicit*/
operator
bool
()
const
{
return
bool
(
mHeld
);
}
bool
operator
!
()
const
{
return
!
mHeld
;
}
bool
operator
!
()
const
{
return
!
mHeld
;
}
// support both assignment (dumb ptr idiom) and reset() (smart ptr)
// support both assignment (dumb ptr idiom) and reset() (smart ptr)
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llmediadataclient.cpp
+
0
−
1
View file @
b0ba682e
...
@@ -154,7 +154,6 @@ void mark_dead_and_remove_if(T &c, const PredicateMatchRequest &matchPred)
...
@@ -154,7 +154,6 @@ void mark_dead_and_remove_if(T &c, const PredicateMatchRequest &matchPred)
if
(
matchPred
(
*
it
))
if
(
matchPred
(
*
it
))
{
{
(
*
it
)
->
markDead
();
(
*
it
)
->
markDead
();
// *TDOO: When C++11 is in change the following line to: it = c.erase(it);
c
.
erase
(
it
++
);
c
.
erase
(
it
++
);
}
}
else
else
...
...
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