]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Make all functions of QCollection inline, since we need to have them for dim and...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 17 Jan 2007 00:17:36 +0000 (00:17 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 17 Jan 2007 00:17:36 +0000 (00:17 +0000)
git-svn-id: https://svn.dealii.org/trunk@14320 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/fe/q_collection.h
deal.II/deal.II/source/fe/q_collection.cc [deleted file]

index 7aeb9a01353bd536b33b5c5971f37e179a2131a6..51dd2bc99f04de9f06cf5a74e752187483ce80f1 100644 (file)
@@ -17,6 +17,7 @@
 #include <base/subscriptor.h>
 #include <base/quadrature.h>
 #include <base/smartpointer.h>
+#include <base/memory_consumption.h>
 #include <fe/fe.h>
 
 #include <vector>
@@ -189,6 +190,66 @@ namespace hp
            ExcIndexRange (index, 0, quadratures.size ()));
     return *quadratures[index];
   }
+
+
+
+  template <int dim>
+  inline
+  QCollection<dim>::QCollection ()
+  {}
+
+
+
+  template <int dim>
+  inline
+  QCollection<dim>::QCollection (const Quadrature<dim> &quadrature)
+  {
+    quadratures
+      .push_back (boost::shared_ptr<const Quadrature<dim> >(new Quadrature<dim>(quadrature)));
+  }
+
+  
+
+  template <int dim>
+  inline
+  QCollection<dim>::
+  QCollection (const QCollection<dim> &q_collection)
+                  :
+                  Subscriptor (),
+                                                   // copy the array
+                                                   // of shared
+                                                   // pointers. nothing
+                                                   // bad should
+                                                   // happen -- they
+                                                   // simply all point
+                                                   // to the same
+                                                   // objects, and the
+                                                   // last one to die
+                                                   // will delete the
+                                                   // mappings
+                  quadratures (q_collection.quadratures)
+  {}
+
+
+
+  template <int dim>
+  inline
+  unsigned int
+  QCollection<dim>::memory_consumption () const
+  {
+    return (sizeof(*this) +
+           MemoryConsumption::memory_consumption (quadratures));
+  }
+
+
+  template <int dim>
+  inline
+  void
+  QCollection<dim>::push_back (const Quadrature<dim> &new_quadrature)
+  {
+    quadratures
+      .push_back (boost::shared_ptr<const Quadrature<dim> >(new Quadrature<dim>(new_quadrature)));
+  }
   
 } // namespace hp
 
diff --git a/deal.II/deal.II/source/fe/q_collection.cc b/deal.II/deal.II/source/fe/q_collection.cc
deleted file mode 100644 (file)
index c39e9bb..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-//----------------------------  q_collection.cc  ----------------------------
-//    $Id$
-//    Version: $Name$
-//
-//    Copyright (C) 2003, 2006 by the deal.II authors
-//
-//    This file is subject to QPL and may not be  distributed
-//    without copyright and license information. Please refer
-//    to the file deal.II/doc/license.html for the  text  and
-//    further information on this license.
-//
-//----------------------------  q_collection.cc  ----------------------------
-
-#include <base/memory_consumption.h>
-#include <fe/q_collection.h>
-
-DEAL_II_NAMESPACE_OPEN
-
-
-namespace hp
-{
-  
-  template <int dim>
-  QCollection<dim>::QCollection ()
-  {}
-
-
-  template <int dim>
-  QCollection<dim>::QCollection (const Quadrature<dim> &quadrature)
-  {
-    quadratures
-      .push_back (boost::shared_ptr<const Quadrature<dim> >(new Quadrature<dim>(quadrature)));
-  }
-
-  
-
-  template <int dim>
-  QCollection<dim>::
-  QCollection (const QCollection<dim> &q_collection)
-                  :
-                  Subscriptor (),
-                                                   // copy the array
-                                                   // of shared
-                                                   // pointers. nothing
-                                                   // bad should
-                                                   // happen -- they
-                                                   // simply all point
-                                                   // to the same
-                                                   // objects, and the
-                                                   // last one to die
-                                                   // will delete the
-                                                   // mappings
-                  quadratures (q_collection.quadratures)
-  {}
-
-
-
-  template <int dim>
-  unsigned int
-  QCollection<dim>::memory_consumption () const
-  {
-    return (sizeof(*this) +
-           MemoryConsumption::memory_consumption (quadratures));
-  }
-
-
-  template <int dim>
-  void
-  QCollection<dim>::push_back (const Quadrature<dim> &new_quadrature)
-  {
-    quadratures
-      .push_back (boost::shared_ptr<const Quadrature<dim> >(new Quadrature<dim>(new_quadrature)));
-  }
-
-
-// explicit instantiations
-  template class QCollection<deal_II_dimension>;
-#if deal_II_dimension >= 2
-  template class QCollection<deal_II_dimension-1>;
-#endif
-
-  
-}
-DEAL_II_NAMESPACE_CLOSE

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.