inline an include file. Not used from C anymore

diff --git a/include/xbt/backtrace.h b/include/xbt/backtrace.h
deleted file mode 100644 (file)
index 761a4b6..0000000
--- a/include/xbt/backtrace.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (c) 2005-2018. The SimGrid Team. All rights reserved.          */
-
-/* This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. */
-
-#ifndef XBT_BACKTRACE_H
-#define XBT_BACKTRACE_H
-
-#include <xbt/base.h>
-
-SG_BEGIN_DECL()
-
-typedef void* xbt_backtrace_location_t;
-
-/** @brief Shows a backtrace of the current location */
-XBT_PUBLIC void xbt_backtrace_display_current();
-
-/** @brief reimplementation of glibc backtrace based directly on gcc library, without implicit malloc  */
-XBT_PUBLIC int xbt_backtrace_no_malloc(void** bt, int size);
-
-/** @brief Captures a backtrace for further use */
-XBT_PUBLIC size_t xbt_backtrace_current(xbt_backtrace_location_t* loc, size_t count);
-
-/** @brief Display a previously captured backtrace */
-XBT_PUBLIC void xbt_backtrace_display(xbt_backtrace_location_t* loc, size_t count);
-
-/** @brief Get current backtrace with libunwind */
-XBT_PUBLIC int xbt_libunwind_backtrace(void** bt, int size);
-
-SG_END_DECL()
-
-#endif

diff --git a/include/xbt/backtrace.hpp b/include/xbt/backtrace.hpp
index 1542188..7801fb8 100644 (file)
--- a/include/xbt/backtrace.hpp
+++ b/include/xbt/backtrace.hpp
@@ -6,13 +6,31 @@
 #ifndef SIMGRIX_XBT_BACKTRACE_HPP
 #define SIMGRIX_XBT_BACKTRACE_HPP
 
-#include <cstddef>
+#include <xbt/base.h>
 
-#include <string>
+#include <cstddef>
 #include <memory>
+#include <string>
 #include <vector>
 
-#include <xbt/backtrace.h>
+SG_BEGIN_DECL()
+/** @brief Shows a backtrace of the current location */
+XBT_PUBLIC void xbt_backtrace_display_current();
+SG_END_DECL()
+
+typedef void* xbt_backtrace_location_t;
+
+/** @brief reimplementation of glibc backtrace based directly on gcc library, without implicit malloc  */
+XBT_PUBLIC int xbt_backtrace_no_malloc(void** bt, int size);
+
+/** @brief Captures a backtrace for further use */
+XBT_PUBLIC size_t xbt_backtrace_current(xbt_backtrace_location_t* loc, size_t count);
+
+/** @brief Display a previously captured backtrace */
+XBT_PUBLIC void xbt_backtrace_display(xbt_backtrace_location_t* loc, size_t count);
+
+/** @brief Get current backtrace with libunwind */
+XBT_PUBLIC int xbt_libunwind_backtrace(void** bt, int size);
 
 namespace simgrid {
 namespace xbt {

diff --git a/src/xbt/backtrace.cpp b/src/xbt/backtrace.cpp
index 5be4b01..29018c0 100644 (file)
--- a/src/xbt/backtrace.cpp
+++ b/src/xbt/backtrace.cpp
@@ -15,7 +15,6 @@
 #endif
 
 #include "simgrid/simix.h" /* SIMIX_process_self_get_name() */
-#include <xbt/backtrace.h>
 #include <xbt/backtrace.hpp>
 #include <xbt/log.h>
 #include <xbt/sysdep.h>

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 19d6115..1f1e27d 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -743,7 +743,6 @@ set(headers_to_install
   include/xbt/asserts.h
   include/xbt/automaton.h
   include/xbt/automaton.hpp
-  include/xbt/backtrace.h
   include/xbt/backtrace.hpp
   include/xbt/base.h
   include/xbt/config.h