Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
29d6d74b
Commit
29d6d74b
authored
Oct 16, 2008
by
Andrew Heather
Browse files
updating failed conflict resolution
parent
10e8b732
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
View file @
29d6d74b
...
...
@@ -95,31 +95,6 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::setSize
}
template
<
class
T
,
unsigned
SizeInc
,
unsigned
SizeMult
,
unsigned
SizeDiv
>
inline
void
Foam
::
DynamicList
<
T
,
SizeInc
,
SizeMult
,
SizeDiv
>::
setSize
(
const
label
s
,
const
T
&
t
)
{
if
(
s
<=
List
<
T
>::
size
())
{
// shrink addressable size, leave allocated size untouched
List
<
T
>::
size
()
=
s
;
}
else
{
label
nextFree
=
List
<
T
>::
size
();
allocSize_
=
s
;
List
<
T
>::
setSize
(
allocSize_
,
t
);
List
<
T
>::
size
()
=
nextFree
;
=======
>>>>>>>
olesenm
:
src
/
OpenFOAM
/
containers
/
Lists
/
DynamicList
/
DynamicListI
.
H
}
List
<
T
>::
size
(
nextFree
);
}
template
<
class
T
,
unsigned
SizeInc
,
unsigned
SizeMult
,
unsigned
SizeDiv
>
inline
void
Foam
::
DynamicList
<
T
,
SizeInc
,
SizeMult
,
SizeDiv
>::
clear
()
{
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment