Merge master into develop

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

CMakeLists.txt

@@ -3,7 +3,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})
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)

include/boost-patched/graph/reverse_graph.hpp

@@ -0,0 +1,27 @@
+#ifndef REVERSE_GRAPH_PATCHED_H_
+#define REVERSE_GRAPH_PATCHED_H_
+
+#include <boost/version.hpp>
+
+#include <boost/graph/reverse_graph.hpp>
+
+#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 <class BidirectionalGraph, class GRef>
+inline typename graph_traits<BidirectionalGraph>::degree_size_type
+degree(const typename graph_traits<BidirectionalGraph>::vertex_descriptor u,
+       const reverse_graph<BidirectionalGraph,GRef>& g)
+{
+    return degree(u, g.m_g);
+}
+
+} // namespace boost
+
+#endif // Boost 1.62.0
+
+#endif

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 <boost-patched/graph/dominator_tree.hpp> // locally patched version
-#include <boost/graph/reverse_graph.hpp>
+#include <boost-patched/graph/reverse_graph.hpp>
 
 using namespace std;
 using boost::make_assoc_property_map;