@@ -1,11 +1,11 @@

 Package: RBGL

-Version: 1.59.4

+Version: 1.59.5

 Title: An interface to the BOOST graph library

 Author: Vince Carey <stvjc@channing.harvard.edu>, Li Long

         <li.long@isb-sib.ch>, R. Gentleman

 Maintainer: Bioconductor Package Maintainer

         <maintainer@bioconductor.org>

-Depends: graph, methods, BH

+Depends: graph, methods

 Imports: methods

 Suggests: Rgraphviz, XML, RUnit, BiocGenerics

 Description: A fairly extensive and comprehensive interface to the

@@ -14,3 +14,4 @@ License: Artistic-2.0

 URL: http://www.bioconductor.org

 LazyLoad: yes

 biocViews: GraphAndNetwork, Network

+LinkingTo: BH

@@ -1 +1 @@

-PKG_CPPFLAGS=@BOOSTFLAGS@ -Dabort=_bgl_abort

+PKG_CPPFLAGS=@BOOSTFLAGS@ 

@@ -10,6 +10,7 @@

 #include <iterator>

 #include <algorithm>

 #include <time.h>

+#include <csignal>

 #include <boost/config.hpp>

 #include <boost/utility.hpp>

@@ -137,5 +138,9 @@ typedef R_adjacency_list<boost::undirectedS, int> Graph_ui;

 typedef R_adjacency_list<boost::directedS, double> Graph_dd;

 typedef R_adjacency_list<boost::undirectedS, double> Graph_ud;

+extern "C"  {

+void sigabrt_handler(int isig);

+}

+

 #endif // RBGL_RBGL_H

@@ -64,9 +64,11 @@ extern "C"

 		std::vector<graph_traits<VEGraph>::vertex_descriptor> f(NV1);

+		signal(SIGABRT, sigabrt_handler);

 		r = isomorphism(g1, g2, isomorphism_map 

 			(make_iterator_property_map(f.begin(), v1_index_map, f[0])));

 		}

+		signal(SIGABRT, SIG_DFL);

 		SEXP ansList, conn;

 		PROTECT(ansList = Rf_allocVector(VECSXP,1));

similarity index 70%

rename from src/kludge.cpp

rename to src/registerSigHandlers.cpp

@@ -1,13 +1,9 @@

+#include "RBGL.hpp"

 #include <Rdefines.h>

-// #include "kludge.hpp"

 extern "C"  {

-void _bgl_abort()

-{

+void sigabrt_handler(int isig) {

     Rf_error

         ("internal: RBGL invoked 'abort'; see warnings() and restart R");

 }

 }

-

-

-