[Dune] [Dune-Commit] dune-common r5868 - trunk/dune/common

[Oliver Sander]

Shouldn't this be nullptr instead of null_ptr?

--
Oliver

mblatt at dune-project.org schrieb:
> Author: mblatt
> Date: 2010-01-26 11:23:04 +0100 (Tue, 26 Jan 2010)
> New Revision: 5868
>
> Modified:
>    trunk/dune/common/shared_ptr.hh
> Log:
> 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.
>
>
>
> Modified: trunk/dune/common/shared_ptr.hh
> ===================================================================
> --- trunk/dune/common/shared_ptr.hh	2010-01-26 10:17:36 UTC (rev 5867)
> +++ trunk/dune/common/shared_ptr.hh	2010-01-26 10:23:04 UTC (rev 5868)
> @@ -14,6 +14,7 @@
>  # include <boost/shared_ptr.hpp>
>  #endif
>  
> +#include<dune/common/nullptr.hh>
>  /**
>   * @file 
>   * @brief This file implements the class shared_ptr (a reference counting
> @@ -144,7 +145,7 @@
>      template<class T>
>      inline shared_ptr<T>::shared_ptr()
>      {
> -        rep_ = NULL;
> +        rep_ = null_ptr;
>      }
>  
>      template<class T>
>
>
> _______________________________________________
> Dune-Commit mailing list
> Dune-Commit at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-commit
>   


-- 
************************************************************************
* Oliver Sander                ** email: sander at mi.fu-berlin.de        *
* Freie Universität Berlin     ** phone: + 49 (30) 838 75348           *
* Institut für Mathematik      ** URL  : page.mi.fu-berlin.de/~sander  *
* Arnimallee 6                 ** -------------------------------------*
* 14195 Berlin, Germany        ** Member of MATHEON (www.matheon.de)   *
************************************************************************