Unify Bitmask::Signature with BitmaskSig.

[apitrace] / trace_model.cpp

diff --git a/trace_model.cpp b/trace_model.cpp
index 0d2915f01926c5bd3090373d12be43906e862db7..03f633b4cf33b47c114b11c6c24a9905dc86a132 100644 (file)
--- a/trace_model.cpp
+++ b/trace_model.cpp
@@ -255,9 +255,9 @@ public:
 
     void visit(Bitmask *bitmask) {
         unsigned long long value = bitmask->value;
-        const Bitmask::Signature *sig = bitmask->sig;
+        const BitmaskSig *sig = bitmask->sig;
         bool first = true;
-        for (Bitmask::Signature::const_iterator it = sig->begin(); value != 0 && it != sig->end(); ++it) {
+        for (const BitmaskVal *it = sig->values; value != 0 && it != sig->values + sig->count; ++it) {
             if ((it->value && (value & it->value) == it->value) ||
                 (!it->value && value == 0)) {
                 if (!first) {