Skip to content
Snippets Groups Projects
Commit 07e7ec4a authored by Markus Blatt's avatar Markus Blatt
Browse files

BugFix please merge to release.

gcc-4.4 failed to compile the shared_ptrtest with ''NULL was not declared in this scope''. Introduced usage of null_ptr to fix this.


[[Imported from SVN: r5868]]
parent c0a5dda8
No related branches found
No related tags found
No related merge requests found
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
# include <boost/shared_ptr.hpp> # include <boost/shared_ptr.hpp>
#endif #endif
#include <dune/common/nullptr.hh>
/** /**
* @file * @file
* @brief This file implements the class shared_ptr (a reference counting * @brief This file implements the class shared_ptr (a reference counting
...@@ -146,7 +147,7 @@ namespace Dune ...@@ -146,7 +147,7 @@ namespace Dune
template<class T> template<class T>
inline shared_ptr<T>::shared_ptr() inline shared_ptr<T>::shared_ptr()
{ {
rep_ = NULL; rep_ = null_ptr;
} }
template<class T> template<class T>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment