Unify Bitmask::Pair with BitmaskVal.

[apitrace] / trace_parser.cpp

diff --git a/trace_parser.cpp b/trace_parser.cpp
index e615ed7aa65bd9c4f861924cbc85ddee94483beb..17682bd2a1ebad840613ebea90ab1b6890466931 100644 (file)
--- a/trace_parser.cpp
+++ b/trace_parser.cpp
@@ -328,10 +328,10 @@ Value *Parser::parse_bitmask() {
         size_t size = read_uint();
         sig = new Bitmask::Signature(size);
         for (Bitmask::Signature::iterator it = sig->begin(); it != sig->end(); ++it) {
-            it->first = read_string();
-            it->second = read_uint();
-            if (it->second == 0 && it != sig->begin()) {
-                std::cerr << "warning: bitmask " << it->first << " is zero but is not first flag\n";
+            it->name = read_string();
+            it->value = read_uint();
+            if (it->value == 0 && it != sig->begin()) {
+                std::cerr << "warning: bitmask " << it->name << " is zero but is not first flag\n";
             }
         }
         bitmasks[id] = sig;