[xbt] Remove useless bits

diff --git a/include/xbt/automaton.h b/include/xbt/automaton.h
index 90af851..6b8be48 100644 (file)
--- a/include/xbt/automaton.h
+++ b/include/xbt/automaton.h
@@ -115,15 +115,4 @@ XBT_PUBLIC(void) xbt_automaton_free(xbt_automaton_t a);
 
 SG_END_DECL()
 
-#ifdef __cplusplus
-namespace simgrid {
-namespace xbt {
-  inline void destroy(xbt_automaton_t a)
-  {
-    xbt_automaton_free(a);
-  }
-}
-}
-#endif
-
 #endif

diff --git a/include/xbt/dict.h b/include/xbt/dict.h
index 6a5e912..87c70ec 100644 (file)
--- a/include/xbt/dict.h
+++ b/include/xbt/dict.h
@@ -174,15 +174,4 @@ xbt_dict_foreach(head, cursor, key, data) {
 
 SG_END_DECL()
 
-#ifdef __cplusplus
-namespace simgrid {
-namespace xbt {
-  inline void destroy(xbt_dict_t d)
-  {
-    xbt_dict_free(&d);
-  }
-}
-}
-#endif
-
 #endif                          /* _XBT_DICT_H */

diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h
index 8362120..b8cfbdd 100644 (file)
--- a/include/xbt/dynar.h
+++ b/include/xbt/dynar.h
@@ -258,15 +258,4 @@ xbt_dynar_foreach (dyn,cpt,str) {
 /** @} */
 SG_END_DECL()
 
-#ifdef __cplusplus
-namespace simgrid {
-namespace xbt {
-  inline void destroy(xbt_dynar_t s)
-  {
-    xbt_dynar_free(&s);
-  }
-}
-}
-#endif
-
 #endif                          /* _XBT_DYNAR_H */

diff --git a/include/xbt/dynar.hpp b/include/xbt/dynar.hpp
index 2129007..77bb871 100644 (file)
--- a/include/xbt/dynar.hpp
+++ b/include/xbt/dynar.hpp
@@ -40,14 +40,6 @@ xbt_dynar_t newDeleteDynar()
     [](void* p) { delete *(T**)p; });
 }
 
-/** Dynar of `T*` which `destroy()` its values */
-template<class T> inline
-xbt_dynar_t newDestroyDynar()
-{
-  return xbt_dynar_new(sizeof(T*),
-    [](void* p) { simgrid::xbt::destroy(*(T**)p); });
-}
-
 }
 }
 #endif

diff --git a/include/xbt/fifo.h b/include/xbt/fifo.h
index 61879ca..c373926 100644 (file)
--- a/include/xbt/fifo.h
+++ b/include/xbt/fifo.h
@@ -111,15 +111,4 @@ XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_getPrevItem(xbt_fifo_item_t i);
 
 SG_END_DECL()
 
-#ifdef __cplusplus
-namespace simgrid {
-namespace xbt {
-  inline void destroy(xbt_fifo_t f)
-  {
-    xbt_fifo_free(f);
-  }
-}
-}
-#endif
-
 #endif                          /* _XBT_FIFO_H */

diff --git a/include/xbt/heap.h b/include/xbt/heap.h
index 8ab5753..ddf76dd 100644 (file)
--- a/include/xbt/heap.h
+++ b/include/xbt/heap.h
@@ -37,15 +37,4 @@ XBT_PUBLIC(void ) xbt_heap_update(xbt_heap_t H, int i, double key);
 /* @} */
 SG_END_DECL()
 
-#ifdef __cplusplus
-namespace simgrid {
-namespace xbt {
-  inline void destroy(xbt_heap_t h)
-  {
-    xbt_heap_free(h);
-  }
-}
-}
-#endif
-
 #endif                          /* _XBT_HEAP_H */

diff --git a/include/xbt/lib.h b/include/xbt/lib.h
index 5e10edd..15553e3 100644 (file)
--- a/include/xbt/lib.h
+++ b/include/xbt/lib.h
@@ -77,15 +77,4 @@ XBT_PUBLIC(void) xbt_lib_remove(xbt_lib_t lib, const char *key);
 
 SG_END_DECL()
 
-#ifdef __cplusplus
-namespace simgrid {
-namespace xbt {
-  inline void destroy(xbt_lib_t l)
-  {
-    xbt_lib_free(&l);
-  }
-}
-}
-#endif
-
 #endif                          /* _XBT_LIB_H */

diff --git a/include/xbt/memory.hpp b/include/xbt/memory.hpp
index ac71407..3673943 100644 (file)
--- a/include/xbt/memory.hpp
+++ b/include/xbt/memory.hpp
@@ -12,22 +12,6 @@
 namespace simgrid {
 namespace xbt {
 
-/** Delete operator which call a `destroy()` free function */
-template<class T>
-struct destroy_delete {
-  void operator()(T* t) const
-  {
-    destroy(t);
-  }
-};
-
-/** A `unique_ptr` which works for SimGrid C types (dynar, swag, automaton, etc.)
- *
- *  It uses an overloaded `destroy()` function to delete the object.
- */
-template<class T>
-using unique_ptr = std::unique_ptr<T, destroy_delete<T> >;
-
 }
 }
 

diff --git a/include/xbt/parmap.h b/include/xbt/parmap.h
index e9eb7ca..15257b5 100644 (file)
--- a/include/xbt/parmap.h
+++ b/include/xbt/parmap.h
@@ -48,15 +48,4 @@ XBT_PUBLIC(void*) xbt_parmap_next(xbt_parmap_t parmap);
 
 SG_END_DECL()
 
-#ifdef __cplusplus
-namespace simgrid {
-namespace xbt {
-  inline void destroy(xbt_parmap_t p)
-  {
-    xbt_parmap_destroy(p);
-  }
-}
-}
-#endif
-
 #endif

diff --git a/include/xbt/swag.h b/include/xbt/swag.h
index 2431b30..ecbdb15 100644 (file)
--- a/include/xbt/swag.h
+++ b/include/xbt/swag.h
@@ -193,15 +193,4 @@ static inline void *xbt_swag_getFirst(xbt_swag_t swag)
 
 SG_END_DECL()
 
-#ifdef __cplusplus
-namespace simgrid {
-namespace xbt {
-  inline void destroy(xbt_swag_t s)
-  {
-    xbt_swag_free(s);
-  }
-}
-}
-#endif
-
 #endif                          /* _XBT_SWAG_H */