From 07e7ec4aaa47958b271228097bfbd44f6c0608d3 Mon Sep 17 00:00:00 2001
From: Markus Blatt <mblatt@dune-project.org>
Date: Tue, 26 Jan 2010 10:23:04 +0000
Subject: [PATCH] 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]]
---
dune/common/shared_ptr.hh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dune/common/shared_ptr.hh b/dune/common/shared_ptr.hh
index 5ca23029f..34bd9a11f 100644
--- a/dune/common/shared_ptr.hh
+++ b/dune/common/shared_ptr.hh
@@ -16,6 +16,7 @@
# include <boost/shared_ptr.hpp>
#endif
+#include <dune/common/nullptr.hh>
/**
* @file
* @brief This file implements the class shared_ptr (a reference counting
@@ -146,7 +147,7 @@ namespace Dune
template<class T>
inline shared_ptr<T>::shared_ptr()
{
- rep_ = NULL;
+ rep_ = null_ptr;
}
template<class T>
--
GitLab