Make windows build user friendlier.

[apitrace] / trace_parser.hpp

diff --git a/trace_parser.hpp b/trace_parser.hpp
index 670db96794b35ae4f515ccff0551b00509824f50..0a0105138bb6e144787670dc04ab0e44705eb704 100644 (file)
--- a/trace_parser.hpp
+++ b/trace_parser.hpp
@@ -28,9 +28,7 @@
 
 
 #include <iostream>
-#include <map>
 #include <list>
-#include <string>
 
 #include "trace_format.hpp"
 #include "trace_model.hpp"
@@ -47,16 +45,16 @@ protected:
     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;
@@ -79,7 +77,7 @@ protected:
 
     Call *parse_leave(void);
 
-    void parse_call_details(Call *call);
+    bool parse_call_details(Call *call);
 
     void parse_arg(Call *call);
 
@@ -107,7 +105,7 @@ protected:
 
     Value *parse_opaque();
 
-    std::string read_string(void);
+    const char * read_string(void);
 
     unsigned long long read_uint(void);