change for selective Backtrace (SENF_BACKTRACE). Included via autoconf if SENF_DEBUG...

[senf.git] / senf / config.hh

diff --git a/senf/config.hh b/senf/config.hh
index 1c6122f..4e26793 100644 (file)
--- a/senf/config.hh
+++ b/senf/config.hh
@@ -30,7 +30,7 @@
 #include <boost/cstdint.hpp>
 #include <limits.h>
 
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace config {
@@ -43,17 +43,18 @@ namespace config {
 # include "local_config.hh"
 #
 # ifndef SENF_ABSOLUTE_INCLUDE_PATH
-#     define SENF_ABSOLUTE_INCLUDE_PATH(senf_relative_include_file_path) <senf/senf_relative_include_file_path>
+#     define SENF_ABSOLUTE_INCLUDE_PATH(senf_relative_include_file_path) \
+          <senf/senf_relative_include_file_path>
 # endif
 #
 # ifndef SENF_copy_n
 #     ifdef HAVE_GNUCXX_COPYN
 #         include <ext/algorithm>
-#         define SENF_copy_n __gnu_cxx::copy_n
+          namespace senf { namespace config { using __gnu_cxx::copy_n; }}
 #     endif
 #     ifdef HAVE_STD_COPYN
 #         include <algorithm>
-#         define SENF_copy_n std::copy_n
+          namespace senf { namespace config { using std::copy_n; }}
 #     endif
 #  endif
 #
@@ -61,7 +62,9 @@ namespace config {
 #     define SENF_MPL_RV_ALIGNMENT 16
 # endif
 #
-# if !defined(SENF_BUFFER_USE_LOCALS) && !defined(SENF_BUFFER_USE_ALLOCA) && !defined(SENF_BUFFER_USE_NEW)
+# if    !defined(SENF_BUFFER_USE_LOCALS) \
+     && !defined(SENF_BUFFER_USE_ALLOCA) \
+     && !defined(SENF_BUFFER_USE_NEW)
 #     define SENF_BUFFER_USE_NEW 1
 # endif
 #
@@ -89,10 +92,16 @@ namespace config {
 #     define SENF_PACKET_ANNOTATION_SLOTS 8
 # endif
 #
-//# define SENF_PACKET_NO_COMPLEX_ANNOTATIONS
-
-
-///////////////////////////////hh.e////////////////////////////////////////
+# ifndef SENF_PACKET_ANNOTATION_SLOTSIZE
+#     define SENF_PACKET_ANNOTATION_SLOTSIZE 16
+# endif
+#
+# ifdef SENF_DEBUG
+#     ifdef HAVE_EXECINFO_H
+#          define SENF_BACKTRACE
+#     endif
+# endif
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 
 \f