From 21b44fcbc37a367dbc31b2f0b90bbc7526342fb1 Mon Sep 17 00:00:00 2001 From: Matthew Barr Date: Thu, 20 Oct 2016 09:49:10 +1100 Subject: [PATCH 1/3] Add the missing degree() in Boost 1.62 This is a workaround that fixes issue #39 --- include/boost-patched/graph/reverse_graph.hpp | 27 +++++++++++++++++++ src/nfagraph/ng_dominators.cpp | 4 +-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 include/boost-patched/graph/reverse_graph.hpp diff --git a/include/boost-patched/graph/reverse_graph.hpp b/include/boost-patched/graph/reverse_graph.hpp new file mode 100644 index 00000000..07a11f9b --- /dev/null +++ b/include/boost-patched/graph/reverse_graph.hpp @@ -0,0 +1,27 @@ +#ifndef REVERSE_GRAPH_PATCHED_H_ +#define REVERSE_GRAPH_PATCHED_H_ + +#include + +#include + +#if (BOOST_VERSION == 106200) + +// Boost 1.62.0 does not implement degree() in reverse_graph which is required +// by BidirectionalGraph, so add it. + +namespace boost { + +template +inline typename graph_traits::degree_size_type +degree(const typename graph_traits::vertex_descriptor u, + const reverse_graph& g) +{ + return degree(u, g.m_g); +} + +} // namespace boost + +#endif // Boost 1.62.0 + +#endif diff --git a/src/nfagraph/ng_dominators.cpp b/src/nfagraph/ng_dominators.cpp index f2980e17..05650aaf 100644 --- a/src/nfagraph/ng_dominators.cpp +++ b/src/nfagraph/ng_dominators.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Intel Corporation + * Copyright (c) 2015-16, Intel Corporation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -39,7 +39,7 @@ #include "util/ue2_containers.h" #include // locally patched version -#include +#include using namespace std; using boost::make_assoc_property_map; From c2fcc93fc9cac25cb97ed9d6ad8c6dd0ad3af868 Mon Sep 17 00:00:00 2001 From: Matthew Barr Date: Tue, 15 Nov 2016 09:54:04 +1100 Subject: [PATCH 2/3] Update changelog for 4.3.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92b59fbf..729e58ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ This is a list of notable changes to Hyperscan, in reverse chronological order. +## [4.3.2] 2016-11-15 + +- Bugfix for issue #39. This small change is a workaround for an issue in + Boost 1.62. The fix has been submitted to Boost for inclusion in a future + release. + ## [4.3.1] 2016-08-29 - Bugfix for issue #30. In recent versions of Clang, a write to a variable was being elided, resulting in corrupted stream state after calling From 0a16e6f78c5277c50e2819c4fcf218154132c679 Mon Sep 17 00:00:00 2001 From: Matthew Barr Date: Tue, 15 Nov 2016 09:54:28 +1100 Subject: [PATCH 3/3] Bump version number for release --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0094d94..842834a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project (Hyperscan C CXX) set (HS_MAJOR_VERSION 4) set (HS_MINOR_VERSION 3) -set (HS_PATCH_VERSION 1) +set (HS_PATCH_VERSION 2) set (HS_VERSION ${HS_MAJOR_VERSION}.${HS_MINOR_VERSION}.${HS_PATCH_VERSION}) # since we are doing this manually, we only have three types