[Getfem-commits] (no subject)

[Andriy Andreykiv]

branch: upgrading_getfem_to_cpp14
commit 8a7adc6bfe3a3636b06bc380b51a180f4d5d3db5
Author: aa <address@hidden>
Date:   Mon Feb 18 15:53:11 2019 +0100

    further eradication of boost
---
 src/getfem/bgeot_config.h              | 7 -------
 src/getfem/bgeot_kdtree.h              | 6 +++++-
 src/getfem/bgeot_rtree.h               | 6 +++++-
 src/getfem/getfem_mesh_fem_level_set.h | 5 ++++-
 src/getfem/getfem_partial_mesh_fem.h   | 5 ++++-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/getfem/bgeot_config.h b/src/getfem/bgeot_config.h
index 66a367b..ad951fa 100644
--- a/src/getfem/bgeot_config.h
+++ b/src/getfem/bgeot_config.h
@@ -50,13 +50,6 @@
 #include "gmm/gmm_kernel.h"
 #include "gmm/gmm_dense_lu.h"
 
-#ifdef GETFEM_HAVE_BOOST
-# include <boost/version.hpp>
-# include <boost/noncopyable.hpp>
-#else
-# include <getfem_boost/noncopyable.hpp> 
-#endif
-
 #ifdef GETFEM_HAVE_QDLIB
 // #  define NO_INLINE
 #  ifdef GETFEM_QDLIB_USE_QUAD
diff --git a/src/getfem/bgeot_kdtree.h b/src/getfem/bgeot_kdtree.h
index 81c00e9..e347e5a 100644
--- a/src/getfem/bgeot_kdtree.h
+++ b/src/getfem/bgeot_kdtree.h
@@ -100,12 +100,16 @@ namespace bgeot {
   }
   @endcode
   */
-  class kdtree : public boost::noncopyable {
+  class kdtree {
     dim_type N; /* dimension of points */
     std::unique_ptr<kdtree_elt_base> tree;
     kdtree_tab_type pts;
   public:
     kdtree() : N(0) {}
+
+    kdtree(const kdtree&) = delete;
+    kdtree &operator = (const kdtree&) = delete;
+
     /// reset the tree, remove all points
     void clear() { clear_tree(); pts = kdtree_tab_type(); N = 0; }
     void reserve(size_type n) { pts.reserve(n); }
diff --git a/src/getfem/bgeot_rtree.h b/src/getfem/bgeot_rtree.h
index 397eec3..d4c4ee2 100644
--- a/src/getfem/bgeot_rtree.h
+++ b/src/getfem/bgeot_rtree.h
@@ -63,12 +63,16 @@ namespace bgeot {
    * This is not a dynamic structure. Once a query has been made on the
    * tree, new boxes should not be added.
    */
-  class rtree : public boost::noncopyable {
+  class rtree {
   public:
     typedef std::deque<box_index> box_cont;
     typedef std::vector<const box_index*> pbox_cont;
     typedef std::set<const box_index*> pbox_set;
 
+    rtree() = default;
+    rtree(const rtree&) = delete;
+    rtree& operator = (const rtree&) = delete;
+
     void add_box(base_node min, base_node max, size_type id=size_type(-1)) {
       box_index bi; bi.min = min; bi.max = max;
       bi.id = (id + 1) ? id : boxes.size();
diff --git a/src/getfem/getfem_mesh_fem_level_set.h 
b/src/getfem/getfem_mesh_fem_level_set.h
index 81cb4b8..e0e853c 100644
--- a/src/getfem/getfem_mesh_fem_level_set.h
+++ b/src/getfem/getfem_mesh_fem_level_set.h
@@ -45,7 +45,7 @@
 
 namespace getfem {
 
-  class mesh_fem_level_set : public mesh_fem, public boost::noncopyable {
+  class mesh_fem_level_set : public mesh_fem {
   protected :
     const mesh_level_set &mls;
     const mesh_fem &mf;
@@ -72,6 +72,9 @@ namespace getfem {
     
     mesh_fem_level_set(const mesh_level_set &me, const mesh_fem &mef);
 
+    mesh_fem_level_set(const mesh_fem_level_set&) = delete;
+    mesh_fem_level_set& operator = (const mesh_fem_level_set&) = delete;
+
     ~mesh_fem_level_set() { clear_build_methods(); }
   };
 
diff --git a/src/getfem/getfem_partial_mesh_fem.h 
b/src/getfem/getfem_partial_mesh_fem.h
index b6bd00d..30ee394 100644
--- a/src/getfem/getfem_partial_mesh_fem.h
+++ b/src/getfem/getfem_partial_mesh_fem.h
@@ -52,7 +52,7 @@ namespace getfem {
      a subclass of mesh_fem which allows to eliminate a number of dof
      of the original mesh_fem.
   */
-  class partial_mesh_fem : public mesh_fem, public boost::noncopyable {
+  class partial_mesh_fem : public mesh_fem {
   protected :
     const mesh_fem &mf;
     mutable bool is_adapted;
@@ -152,6 +152,9 @@ namespace getfem {
     partial_mesh_fem(const mesh_fem &mef);
     partial_mesh_fem(const mesh_fem *mef);
 
+    partial_mesh_fem(const partial_mesh_fem&) = delete;
+    partial_mesh_fem& operator = (const partial_mesh_fem&) = delete;
+
   };
 
   typedef std::shared_ptr<partial_mesh_fem> ppartial_mesh_fem;