From 74225b4ab9dc011bc2ce1021c460ecdced98b4dc Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 27 Oct 2018 18:01:47 +0200
Subject: [PATCH] inline an include file. Not used from C anymore

---
 include/xbt/backtrace.h          | 32 --------------------------------
 include/xbt/backtrace.hpp        | 24 +++++++++++++++++++++---
 src/xbt/backtrace.cpp            |  1 -
 tools/cmake/DefinePackages.cmake |  1 -
 4 files changed, 21 insertions(+), 37 deletions(-)
 delete mode 100644 include/xbt/backtrace.h

diff --git a/include/xbt/backtrace.h b/include/xbt/backtrace.h
deleted file mode 100644
index 761a4b6829..0000000000
--- 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 15421885dd..7801fb847f 100644
--- 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 5be4b0118a..29018c0962 100644
--- 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 19d61156a8..1f1e27d24a 100644
--- 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
-- 
2.20.1