Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
agnumpde
dune-tnnmg
Commits
78961ec7
Commit
78961ec7
authored
Jul 14, 2015
by
Oliver Sander
Browse files
Use std::shared_ptr instead of Dune::shared_ptr
parent
f416214d
Changes
1
Hide whitespace changes
Inline
Side-by-side
dune/tnnmg/functionals/sumfunctional.hh
View file @
78961ec7
#ifndef DUNE_TNNMG_FUNCTIONALS_SUMFUNCTIONAL_HH
#define DUNE_TNNMG_FUNCTIONALS_SUMFUNCTIONAL_HH
#include
<memory>
#include
"dune/tnnmg/functionals/nonsmoothconvexfunctional.hh"
namespace
Dune
{
...
...
@@ -25,7 +27,7 @@ namespace Dune {
psi_
=
Dune
::
stackobject_to_shared_ptr
(
psi
);
}
SumFunctional
(
Dune
::
shared_ptr
<
NonlinearityType
>&
phi
,
Dune
::
shared_ptr
<
NonlinearityType
>&
psi
)
:
SumFunctional
(
std
::
shared_ptr
<
NonlinearityType
>&
phi
,
std
::
shared_ptr
<
NonlinearityType
>&
psi
)
:
phi_
(
phi
),
psi_
(
psi
)
{}
...
...
@@ -115,8 +117,8 @@ namespace Dune {
}
private:
Dune
::
shared_ptr
<
NonlinearityType
>
phi_
;
Dune
::
shared_ptr
<
NonlinearityType
>
psi_
;
std
::
shared_ptr
<
NonlinearityType
>
phi_
;
std
::
shared_ptr
<
NonlinearityType
>
psi_
;
};
}
// namespace TNNMG
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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