Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-common
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
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Nils-Arne Dreier
dune-common
Commits
a8c65a5b
Commit
a8c65a5b
authored
9 years ago
by
Christoph Grüninger
Browse files
Options
Downloads
Patches
Plain Diff
[cleanup] Use <memory> instead of own shared_ptr.hh
parent
890057ee
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
dune/common/arraylist.hh
+6
-6
6 additions, 6 deletions
dune/common/arraylist.hh
dune/common/parallel/mpicollectivecommunication.hh
+4
-4
4 additions, 4 deletions
dune/common/parallel/mpicollectivecommunication.hh
with
10 additions
and
10 deletions
dune/common/arraylist.hh
+
6
−
6
View file @
a8c65a5b
// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
// vi: set et ts=4 sw=2 sts=2:
#ifndef DUNE_ARRAYLIST_HH
#define DUNE_ARRAYLIST_HH
#ifndef DUNE_
COMMON_
ARRAYLIST_HH
#define DUNE_
COMMON_
ARRAYLIST_HH
#include
<array>
#include
<cassert>
#include
<memory>
#include
<vector>
#include
<array>
#include
"shared_ptr.hh"
#include
"iteratorfacades.hh"
namespace
Dune
...
...
@@ -194,7 +194,7 @@ namespace Dune
/**
* @brief The allocators for the smart pointer.
*/
typedef
typename
A
::
template
rebind
<
shared_ptr
<
std
::
array
<
MemberType
,
chunkSize_
>
>
>::
other
typedef
typename
A
::
template
rebind
<
std
::
shared_ptr
<
std
::
array
<
MemberType
,
chunkSize_
>
>
>::
other
SmartPointerAllocator
;
/**
...
...
@@ -210,7 +210,7 @@ namespace Dune
friend
class
ConstArrayListIterator
<
T
,
N
,
A
>
;
/** @brief the data chunks of our list. */
std
::
vector
<
shared_ptr
<
std
::
array
<
MemberType
,
chunkSize_
>
>
,
std
::
vector
<
std
::
shared_ptr
<
std
::
array
<
MemberType
,
chunkSize_
>
>
,
SmartPointerAllocator
>
chunks_
;
/** @brief The current data capacity.
* This is the capacity that the list could have theoretically
...
...
This diff is collapsed.
Click to expand it.
dune/common/parallel/mpicollectivecommunication.hh
+
4
−
4
View file @
a8c65a5b
...
...
@@ -15,10 +15,10 @@
#include
<complex>
#include
<algorithm>
#include
<functional>
#include
<memory>
#include
<dune/common/exceptions.hh>
#include
<dune/common/binaryfunctions.hh>
#include
<dune/common/shared_ptr.hh>
#include
"collectivecommunication.hh"
#include
"mpitraits.hh"
...
...
@@ -44,7 +44,7 @@ namespace Dune
{
if
(
!
op
)
{
op
=
shared_ptr
<
MPI_Op
>
(
new
MPI_Op
);
op
=
std
::
shared_ptr
<
MPI_Op
>
(
new
MPI_Op
);
MPI_Op_create
((
void
(
*
)(
void
*
,
void
*
,
int
*
,
MPI_Datatype
*
))
&
operation
,
true
,
op
.
get
());
}
return
*
op
;
...
...
@@ -62,12 +62,12 @@ namespace Dune
}
Generic_MPI_Op
()
{}
Generic_MPI_Op
(
const
Generic_MPI_Op
&
)
{}
static
shared_ptr
<
MPI_Op
>
op
;
static
std
::
shared_ptr
<
MPI_Op
>
op
;
};
template
<
typename
Type
,
typename
BinaryFunction
>
shared_ptr
<
MPI_Op
>
Generic_MPI_Op
<
Type
,
BinaryFunction
>::
op
=
shared_ptr
<
MPI_Op
>
(
static_cast
<
MPI_Op
*>
(
0
));
std
::
shared_ptr
<
MPI_Op
>
Generic_MPI_Op
<
Type
,
BinaryFunction
>::
op
=
std
::
shared_ptr
<
MPI_Op
>
(
static_cast
<
MPI_Op
*>
(
0
));
#define ComposeMPIOp(type,func,op) \
template<> \
...
...
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