Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Root
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
为了安全,强烈建议开启2FA双因子认证:User Settings -> Account -> Enable two-factor authentication!!!
Show more breadcrumbs
cxwx
Root
Commits
c1026e00
Commit
c1026e00
authored
9 years ago
by
Axel Naumann
Browse files
Options
Downloads
Patches
Plain Diff
ROOT-7825: dereference address for "*&".
parent
96163681
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bindings/pyroot/src/Converters.cxx
+2
-2
2 additions, 2 deletions
bindings/pyroot/src/Converters.cxx
bindings/pyroot/src/Converters.h
+5
-1
5 additions, 1 deletion
bindings/pyroot/src/Converters.h
with
7 additions
and
3 deletions
bindings/pyroot/src/Converters.cxx
+
2
−
2
View file @
c1026e00
...
...
@@ -1021,7 +1021,7 @@ Bool_t PyROOT::TCppObjectPtrConverter::SetArg(
// set pointer (may be null) and declare success
para
.
fValue
.
fVoidp
=
&
((
ObjectProxy
*
)
pyobject
)
->
fObject
;
para
.
fTypeCode
=
'p'
;
para
.
fTypeCode
=
fIsReference
?
'V'
:
'p'
;
return
kTRUE
;
}
...
...
@@ -1372,7 +1372,7 @@ PyROOT::TConverter* PyROOT::CreateConverter( const std::string& fullType, Long_t
else
// -- CLING WORKAROUND
if
(
cpd
==
"**"
||
cpd
==
"*&"
||
cpd
==
"&*"
)
result
=
new
TCppObjectPtrConverter
(
klass
,
control
);
result
=
new
TCppObjectPtrConverter
(
klass
,
control
,
cpd
[
1
]
==
'&'
);
else
if
(
cpd
==
"*"
&&
size
<=
0
)
result
=
new
TCppObjectConverter
(
klass
,
control
);
else
if
(
cpd
==
"&"
)
...
...
This diff is collapsed.
Click to expand it.
bindings/pyroot/src/Converters.h
+
5
−
1
View file @
c1026e00
...
...
@@ -209,12 +209,16 @@ namespace PyROOT {
class
TCppObjectPtrConverter
:
public
TCppObjectConverter
{
public:
using
TCppObjectConverter
::
TCppObjectConverter
;
TCppObjectPtrConverter
(
Cppyy
::
TCppType_t
klass
,
Bool_t
keepControl
,
Bool_t
isReference
)
:
TCppObjectConverter
(
klass
,
keepControl
),
fIsReference
(
isReference
)
{}
public
:
virtual
Bool_t
SetArg
(
PyObject
*
,
TParameter
&
,
TCallContext
*
ctxt
=
0
);
virtual
PyObject
*
FromMemory
(
void
*
address
);
virtual
Bool_t
ToMemory
(
PyObject
*
value
,
void
*
address
);
protected
:
Bool_t
fIsReference
;
};
class
TCppObjectArrayConverter
:
public
TCppObjectConverter
{
...
...
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