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
Wiki
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
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
Core Modules
dune-common
Commits
22cd7e56
Commit
22cd7e56
authored
15 years ago
by
Oliver Sander
Browse files
Options
Downloads
Patches
Plain Diff
revert back to SmartPointer
[[Imported from SVN: r5655]]
parent
550045e5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dune/common/arraylist.hh
+5
-5
5 additions, 5 deletions
dune/common/arraylist.hh
with
5 additions
and
5 deletions
dune/common/arraylist.hh
+
5
−
5
View file @
22cd7e56
...
...
@@ -7,7 +7,7 @@
#include
<cassert>
#include
<vector>
#include
"s
h
ar
ed_pt
r.hh"
#include
"s
m
ar
tpointe
r.hh"
#include
"array.hh"
#include
"iteratorfacades.hh"
...
...
@@ -199,7 +199,7 @@ namespace Dune
/**
* @brief The allocators for the fixed array.
*/
typedef
typename
A
::
template
rebind
<
shared_pt
r
<
array
<
MemberType
,
chunkSize_
>
>
>::
other
typedef
typename
A
::
template
rebind
<
SmartPointe
r
<
array
<
MemberType
,
chunkSize_
>
>
>::
other
SmartPointerAllocator
;
/**
...
...
@@ -209,7 +209,7 @@ namespace Dune
friend
class
ConstArrayListIterator
<
T
,
N
,
A
>
;
/** @brief the data chunks of our list. */
std
::
vector
<
shared_pt
r
<
array
<
MemberType
,
chunkSize_
>
>
,
std
::
vector
<
SmartPointe
r
<
array
<
MemberType
,
chunkSize_
>
>
,
SmartPointerAllocator
>
chunks_
;
/** @brief The current data capacity. */
size_type
capacity_
;
...
...
@@ -491,7 +491,7 @@ namespace Dune
size_t
index
=
start_
+
size_
;
if
(
index
==
capacity_
)
{
chunks_
.
push_back
(
shared_pt
r
<
array
<
MemberType
,
chunkSize_
>
>
());
chunks_
.
push_back
(
SmartPointe
r
<
array
<
MemberType
,
chunkSize_
>
>
());
capacity_
+=
chunkSize_
;
}
elementAt
(
index
)
=
entry
;
...
...
@@ -557,7 +557,7 @@ namespace Dune
// Number of chunks with entries in it;
size_t
chunks
=
((
start_
%
chunkSize_
+
size_
)
/
chunkSize_
);
typedef
typename
std
::
vector
<
shared_pt
r
<
array
<
MemberType
,
typedef
typename
std
::
vector
<
SmartPointe
r
<
array
<
MemberType
,
chunkSize_
>
>
>::
iterator
iterator
;
// Copy chunks to the left.
...
...
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