Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
bob.io.base
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Show more breadcrumbs
bob
bob.io.base
Commits
096c4b5a
Commit
096c4b5a
authored
11 years ago
by
André Anjos
Browse files
Options
Downloads
Patches
Plain Diff
Use boost::shared_ptr<> instead of std's for backward compatibility
parent
fd3911ee
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
xbob/io/hdf5.cpp
+6
-6
6 additions, 6 deletions
xbob/io/hdf5.cpp
with
6 additions
and
6 deletions
xbob/io/hdf5.cpp
+
6
−
6
View file @
096c4b5a
...
@@ -442,7 +442,7 @@ static PyObject* PyBobIoHDF5File_Describe(PyBobIoHDF5FileObject* self, PyObject
...
@@ -442,7 +442,7 @@ static PyObject* PyBobIoHDF5File_Describe(PyBobIoHDF5FileObject* self, PyObject
if
(
!
PyArg_ParseTupleAndKeywords
(
args
,
kwds
,
"s"
,
kwlist
,
&
key
))
return
0
;
if
(
!
PyArg_ParseTupleAndKeywords
(
args
,
kwds
,
"s"
,
kwlist
,
&
key
))
return
0
;
PyObject
*
retval
=
0
;
PyObject
*
retval
=
0
;
st
d
::
shared_ptr
<
PyObject
>
retval_
;
boo
st
::
shared_ptr
<
PyObject
>
retval_
;
try
{
try
{
const
std
::
vector
<
bob
::
io
::
HDF5Descriptor
>&
dv
=
self
->
f
->
describe
(
key
);
const
std
::
vector
<
bob
::
io
::
HDF5Descriptor
>&
dv
=
self
->
f
->
describe
(
key
);
...
@@ -583,7 +583,7 @@ static PyObject* PyBobIoHDF5File_Paths(PyBobIoHDF5FileObject* self, PyObject *ar
...
@@ -583,7 +583,7 @@ static PyObject* PyBobIoHDF5File_Paths(PyBobIoHDF5FileObject* self, PyObject *ar
if
(
pyrel
&&
PyObject_IsTrue
(
pyrel
))
relative
=
true
;
if
(
pyrel
&&
PyObject_IsTrue
(
pyrel
))
relative
=
true
;
PyObject
*
retval
=
0
;
PyObject
*
retval
=
0
;
st
d
::
shared_ptr
<
PyObject
>
retval_
;
boo
st
::
shared_ptr
<
PyObject
>
retval_
;
try
{
try
{
std
::
vector
<
std
::
string
>
values
;
std
::
vector
<
std
::
string
>
values
;
...
@@ -887,17 +887,17 @@ static void null_char_array_deleter(char*) {}
...
@@ -887,17 +887,17 @@ static void null_char_array_deleter(char*) {}
static
void
char_array_deleter
(
char
*
o
)
{
delete
[]
o
;
}
static
void
char_array_deleter
(
char
*
o
)
{
delete
[]
o
;
}
#endif
#endif
static
st
d
::
shared_ptr
<
char
>
PyBobIo_GetString
(
PyObject
*
o
)
{
static
boo
st
::
shared_ptr
<
char
>
PyBobIo_GetString
(
PyObject
*
o
)
{
#if PY_VERSION_HEX < 0x03000000
#if PY_VERSION_HEX < 0x03000000
return
st
d
::
shared_ptr
<
char
>
(
PyString_AsString
(
o
),
null_char_array_deleter
);
return
boo
st
::
shared_ptr
<
char
>
(
PyString_AsString
(
o
),
null_char_array_deleter
);
#else
#else
if
(
PyBytes_Check
(
o
))
{
if
(
PyBytes_Check
(
o
))
{
//fast way out
//fast way out
return
st
d
::
shared_ptr
<
char
>
(
PyBytes_AsString
(
o
),
null_char_array_deleter
);
return
boo
st
::
shared_ptr
<
char
>
(
PyBytes_AsString
(
o
),
null_char_array_deleter
);
}
}
PyObject
*
bytes
=
0
;
PyObject
*
bytes
=
0
;
...
@@ -916,7 +916,7 @@ static std::shared_ptr<char> PyBobIo_GetString(PyObject* o) {
...
@@ -916,7 +916,7 @@ static std::shared_ptr<char> PyBobIo_GetString(PyObject* o) {
char
*
copy
=
new
char
[
length
];
char
*
copy
=
new
char
[
length
];
std
::
strncpy
(
copy
,
PyBytes_AsString
(
bytes
),
length
);
std
::
strncpy
(
copy
,
PyBytes_AsString
(
bytes
),
length
);
return
st
d
::
shared_ptr
<
char
>
(
copy
,
char_array_deleter
);
return
boo
st
::
shared_ptr
<
char
>
(
copy
,
char_array_deleter
);
#endif
#endif
...
...
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