[cig-commits] [commit] master: remove the SmartPointer stuff that never really worked (55e20c9)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/dea94ae3fdac1f434e32718c384fe5ce83109802...db7eea299d721e7afa2dc72d8f42352dc88a9e16

>---------------------------------------------------------------

commit 55e20c90d0d28117cd3491c175aa17518a0dbb09
Author: Timo Heister <timo.heister at gmail.com>
Date:   Sun Jun 1 20:01:12 2014 -0400

    remove the SmartPointer stuff that never really worked


>---------------------------------------------------------------

55e20c90d0d28117cd3491c175aa17518a0dbb09
 include/aspect/simulator.h           | 2 +-
 source/simulator/simulator_access.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/aspect/simulator.h b/include/aspect/simulator.h
index 98043ef..30d2a0e 100644
--- a/include/aspect/simulator.h
+++ b/include/aspect/simulator.h
@@ -92,7 +92,7 @@ namespace aspect
    * @ingroup Simulator
    */
   template <int dim>
-  class Simulator : public Subscriptor
+  class Simulator
   {
     private:
       /**
diff --git a/source/simulator/simulator_access.cc b/source/simulator/simulator_access.cc
index 08696bc..2875588 100644
--- a/source/simulator/simulator_access.cc
+++ b/source/simulator/simulator_access.cc
@@ -35,7 +35,7 @@ namespace aspect
   void
   SimulatorAccess<dim>::initialize (const Simulator<dim> &simulator_object)
   {
-    simulator = SmartPointer<const Simulator<dim> > (&simulator_object, typeid(*this).name());
+    simulator = &simulator_object;
   }