X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=trace_parser.hpp;h=4fff9ad1157129e0da8458f8cca87e68687197ec;hb=3c70dbfb4ca01d92172f87109ba995f6db5f7835;hp=7a88d272d1b7fd50bf59d42bc745f79c72b3ec9e;hpb=c017dded3f1b3ebe3043b0e217bb3cd76a4e1a4e;p=apitrace

diff --git a/trace_parser.hpp b/trace_parser.hpp
index 7a88d27..4fff9ad 100644
--- a/trace_parser.hpp
+++ b/trace_parser.hpp
@@ -29,7 +29,6 @@
 
 #include <iostream>
 #include <list>
-#include <string>
 
 #include "trace_format.hpp"
 #include "trace_model.hpp"
@@ -37,25 +36,26 @@
 
 namespace Trace {
 
+class File;
 
 class Parser
 {
 protected:
-    void *file;
+    File *file;
 
     typedef std::list<Call *> CallList;
     CallList calls;
 
-    typedef std::vector<Call::Signature *> FunctionMap;
+    typedef std::vector<FunctionSig *> FunctionMap;
     FunctionMap functions;
 
-    typedef std::vector<Struct::Signature *> StructMap;
+    typedef std::vector<StructSig *> StructMap;
     StructMap structs;
 
-    typedef std::vector<Enum::Signature *> EnumMap;
+    typedef std::vector<EnumSig *> EnumMap;
     EnumMap enums;
 
-    typedef std::vector<Bitmask::Signature *> BitmaskMap;
+    typedef std::vector<BitmaskSig *> BitmaskMap;
     BitmaskMap bitmasks;
 
     unsigned next_call_no;
@@ -106,7 +106,7 @@ protected:
 
     Value *parse_opaque();
 
-    std::string read_string(void);
+    const char * read_string(void);
 
     unsigned long long read_uint(void);