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.
This commit is contained in:
Matthew Barr 2016-05-10 13:14:25 +10:00
parent 95f35aad0e
commit 0e8867b393

View File

@ -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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * 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. * \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;
}; };
/** /**