Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
XDG Integration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
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
JennaHuntsman
XDG Integration
Commits
a9b82b9d
Commit
a9b82b9d
authored
3 years ago
by
Nat Goodspeed
Committed by
Andrey Lihatskiy
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
SL-15393: Use non-overloaded name for function returning LLSD&.
parent
089743ac
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/llcommon/lleventcoro.cpp
+1
-1
1 addition, 1 deletion
indra/llcommon/lleventcoro.cpp
indra/llcommon/llsdutil.cpp
+4
-3
4 additions, 3 deletions
indra/llcommon/llsdutil.cpp
indra/llcommon/llsdutil.h
+2
-2
2 additions, 2 deletions
indra/llcommon/llsdutil.h
with
7 additions
and
6 deletions
indra/llcommon/lleventcoro.cpp
+
1
−
1
View file @
a9b82b9d
...
@@ -101,7 +101,7 @@ void storeToLLSDPath(LLSD& dest, const LLSD& path, const LLSD& value)
...
@@ -101,7 +101,7 @@ void storeToLLSDPath(LLSD& dest, const LLSD& path, const LLSD& value)
}
}
// Drill down to where we should store 'value'.
// Drill down to where we should store 'value'.
llsd
::
drill
(
dest
,
path
)
=
value
;
llsd
::
drill
_ref
(
dest
,
path
)
=
value
;
}
}
}
// anonymous
}
// anonymous
...
...
This diff is collapsed.
Click to expand it.
indra/llcommon/llsdutil.cpp
+
4
−
3
View file @
a9b82b9d
...
@@ -29,6 +29,7 @@
...
@@ -29,6 +29,7 @@
#include
"linden_common.h"
#include
"linden_common.h"
#include
"llsdutil.h"
#include
"llsdutil.h"
#include
<sstream>
#if LL_WINDOWS
#if LL_WINDOWS
# define WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
...
@@ -862,7 +863,7 @@ bool llsd_equals(const LLSD& lhs, const LLSD& rhs, int bits)
...
@@ -862,7 +863,7 @@ bool llsd_equals(const LLSD& lhs, const LLSD& rhs, int bits)
namespace
llsd
namespace
llsd
{
{
LLSD
&
drill
(
LLSD
&
blob
,
const
LLSD
&
rawPath
)
LLSD
&
drill
_ref
(
LLSD
&
blob
,
const
LLSD
&
rawPath
)
{
{
// Treat rawPath uniformly as an array. If it's not already an array,
// Treat rawPath uniformly as an array. If it's not already an array,
// store it as the only entry in one. (But let's say Undefined means an
// store it as the only entry in one. (But let's say Undefined means an
...
@@ -917,9 +918,9 @@ LLSD& drill(LLSD& blob, const LLSD& rawPath)
...
@@ -917,9 +918,9 @@ LLSD& drill(LLSD& blob, const LLSD& rawPath)
LLSD
drill
(
const
LLSD
&
blob
,
const
LLSD
&
path
)
LLSD
drill
(
const
LLSD
&
blob
,
const
LLSD
&
path
)
{
{
//
non-const
drill() does exactly what we want. Temporarily cast away
// drill
_ref
() does exactly what we want. Temporarily cast away
// const-ness and use that.
// const-ness and use that.
return
drill
(
const_cast
<
LLSD
&>
(
blob
),
path
);
return
drill
_ref
(
const_cast
<
LLSD
&>
(
blob
),
path
);
}
}
}
// namespace llsd
}
// namespace llsd
...
...
This diff is collapsed.
Click to expand it.
indra/llcommon/llsdutil.h
+
2
−
2
View file @
a9b82b9d
...
@@ -184,10 +184,10 @@ namespace llsd
...
@@ -184,10 +184,10 @@ namespace llsd
* - Anything else is an error.
* - Anything else is an error.
*
*
* By implication, if path.isUndefined() or otherwise equivalent to an empty
* By implication, if path.isUndefined() or otherwise equivalent to an empty
* LLSD::Array, drill() returns 'blob' as is.
* LLSD::Array, drill
[_ref]
() returns 'blob' as is.
*/
*/
LLSD
drill
(
const
LLSD
&
blob
,
const
LLSD
&
path
);
LLSD
drill
(
const
LLSD
&
blob
,
const
LLSD
&
path
);
LLSD
&
drill
(
LLSD
&
blob
,
const
LLSD
&
path
);
LLSD
&
drill
_ref
(
LLSD
&
blob
,
const
LLSD
&
path
);
}
}
...
...
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