Unify Bitmask::Pair with BitmaskVal.

[apitrace] / trace_model.hpp

diff --git a/trace_model.hpp b/trace_model.hpp
index 1864b03c390615703d1c2c0377a67ed4496d4289..a942ac99cd529281269304c84e23ad7040cbae9c 100644 (file)
--- a/trace_model.hpp
+++ b/trace_model.hpp
@@ -38,6 +38,8 @@
 #include <vector>
 #include <iostream>
 
+#include "trace_writer.hpp"
+
 
 namespace Trace {
 
@@ -190,8 +192,7 @@ public:
 class Bitmask : public UInt
 {
 public:
-    typedef std::pair<const char *, unsigned long long> Pair;
-    typedef std::vector<Pair> Signature;
+    typedef std::vector<BitmaskVal> Signature;
 
     Bitmask(const Signature *_sig, unsigned long long _value) : UInt(_value), sig(_sig) {}