Changeset 273e668 in git for external/fastjet/Error.hh

Timestamp:

Oct 15, 2014, 10:55:55 AM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

35b9204, b25d4cf

Parents:

f14bd6a

git-author:

Pavel Demin <pavel.demin@…> (10/10/14 08:56:40)

git-committer:

Pavel Demin <pavel.demin@…> (10/15/14 10:55:55)

Message:

upgrade FastJet to version 3.1.0

File:

• external/fastjet/Error.hh (modified) (4 diffs)

external/fastjet/Error.hh

@@ -3 +3 @@
 
 //FJSTARTHEADER
-// $Id: Error.hh 3433 2014-07-23 08:17:03Z salam $
+// $Id: Error.hh 3694 2014-09-18 13:21:54Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -35 +35 @@
 #include<string>
 #include "fastjet/internal/base.hh"
+#include "fastjet/config.h"
+#if (!defined(FASTJET_HAVE_EXECINFO_H)) || defined(__FJCORE__)
+#include "fastjet/LimitedWarning.hh"
+#endif
 
 FASTJET_BEGIN_NAMESPACE      // defined in fastjet/internal/base.hh
@@ -65 +69 @@
   /// controls whether the backtrace is printed out with the error message or not.
   /// The default is "false".
-  static void set_print_backtrace(bool enabled) {_print_backtrace = enabled;}
+  static void set_print_backtrace(bool enabled);
 
   /// sets the default output stream for all errors; by default
@@ -74 +78 @@
 
 private:
+
+#ifndef __FJCORE__
+#if defined(FASTJET_HAVE_EXECINFO_H) && defined(FASTJET_HAVE_DEMANGLING_SUPPORT)
+  /// demangle a given backtrace symbol
+  std::string _demangle(const char* symbol);
+#endif
+#endif
+
   std::string _message;                ///< error message
   static bool _print_errors;           ///< do we print anything?
   static bool _print_backtrace;        ///< do we print the backtrace?
   static std::ostream * _default_ostr; ///< the output stream (cerr if not set)
+#if (!defined(FASTJET_HAVE_EXECINFO_H)) || defined(__FJCORE__)
+  static LimitedWarning _execinfo_undefined;
+#endif
 };