Changeset 3045

Timestamp:

Jun 9, 2013, 7:00:44 AM (9 years ago)

Author:

Peter

Message:

fixes #762. workaround for broken boost header (in v1.41)

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• yat/random/random.h (modified) (1 diff)
• yat/utility/Makefile.am (modified) (1 diff)
• yat/utility/boost_exception_ptr.h (modified) (3 diffs)
• yat/utility/config_public.h.in (modified) (1 diff)

trunk/configure.ac

@@ -283 +283 @@
 )
 
+# Workaround problem that boost 1.41 does not work with certain versions of GCC
+# see ticket #762
+AC_MSG_CHECKING([if boost::mutex workaround is needed])
+AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM([@%:@include <boost/thread.hpp>],
+                   [boost::mutex mutex;]
+   )],
+  [AC_MSG_RESULT([no])
+   AC_DEFINE([YAT_HAVE_WORKING_BOOST_EXCEPTION_PTR], [1],
+             [Define to 1 if boost::exception_ptr works])
+  ],
+  [AC_MSG_RESULT([yes])])
 
 # samtools API from http://samtools.sourceforge.net

trunk/yat/random/random.h

@@ -26 +26 @@
 #include "yat/statistics/Histogram.h"
 #include "yat/utility/deprecate.h"
+
+// always include this before <boost/excpetion_ptr.hpp> indirectly below
+#include "yat/utility/boost_exception_ptr.h"
 
 #include <boost/concept_check.hpp>

trunk/yat/utility/Makefile.am

@@ -59 +59 @@
   $(srcdir)/yat/utility/Aligner.h \
   $(srcdir)/yat/utility/Alignment.h \
+  $(srcdir)/yat/utility/boost_exception_ptr.h \
   $(srcdir)/yat/utility/ColumnStream.h \
   $(srcdir)/yat/utility/CommandLine.h \

trunk/yat/utility/boost_exception_ptr.h

@@ +1 @@
+#ifndef theplu_yat_utility_boost_exception_ptr_h
+#define theplu_yat_utility_boost_exception_ptr_h
+
+/*
+  Copyright (C) 2013 Peter Johansson
+
+  This file is part of the yat library, http://dev.thep.lu.se/yat
+
+  The yat library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 3 of the
+  License, or (at your option) any later version.
+
+  The yat library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with yat. If not, see <http://www.gnu.org/licenses/>.
+*/
+
 //Copyright (c) 2006-2009 Emil Dotchevski and Reverge Studios, Inc.
 
 //Distributed under the Boost Software License, Version 1.0. (See accompanying
 //file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+// This file is patched version of the one distributed in Boost 1.41
+// See ticket #762 http://dev.thep.lu.se/yat/ticket/762 for motivation.
+// If compiler works with <boost/exception_ptr.hpp> that file is
+// included; otherwise this patched version is included
+//
+// Users can include this file before any boost header to avoid the
+// problem reported in: http://dev.thep.lu.se/yat/ticket/762
+
+/// \cond IGNORE_DOXYGEN
+
+#include "config_public.h"
+#ifdef YAT_HAVE_WORKING_BOOST_EXCEPTION_PTR
+#include <boost/exception_ptr.hpp>
+#else
 
 #ifndef UUID_FA5836A2CADA11DC8CD47C8555D89593
@@ -91 +128 @@
             }
 
+        ~exception_ptr() throw() { }
+
         operator unspecified_bool_type() const
             {
@@ -460 +499 @@
 
 #endif
+#endif
+/// \endcond IGNORE_DOXYGEN
+#endif

trunk/yat/utility/config_public.h.in

@@ -43 +43 @@
 #undef YAT_HAVE_BOOST_CONCEPT_WITH_CONSTRUCTOR
 
+/// Define to 1 if boost::exception_ptr works
+#undef YAT_HAVE_WORKING_BOOST_EXCEPTION_PTR
+
 /// Version of yat in string format
 #undef YAT_VERSION