Combine struct elements to avoid inheritance

The multiple inheritance here was slightly overkill, and it also appears to
trigger a MSVC bug when writing through the pointer to member.

diff --git a/src/nfagraph/ng_depth.h b/src/nfagraph/ng_depth.h
index 38a98a1c6ed89b72b49445655c0efc5872923081..16231ea1e0e8fe79dfac8830847889abe4519146 100644 (file)
--- a/src/nfagraph/ng_depth.h
+++ b/src/nfagraph/ng_depth.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Intel Corporation
+ * Copyright (c) 2015-2016, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -64,7 +64,11 @@ struct NFAVertexRevDepth {
 /**
  * \brief Encapsulates min/max depths relative to all of our special vertices.
  */
-struct NFAVertexBidiDepth : NFAVertexDepth, NFAVertexRevDepth {
+struct NFAVertexBidiDepth {
+    DepthMinMax fromStart;
+    DepthMinMax fromStartDotStar;
+    DepthMinMax toAccept;
+    DepthMinMax toAcceptEod;
 };
 
 /**