Move trace dumping to a separate module. Add option to not dump arg names.

[apitrace] / common / trace_model.hpp

diff --git a/common/trace_model.hpp b/common/trace_model.hpp
index 1b2e1f2c45a48ede154195544ff271803e0f444a..4f150bc925caec0162dd21b6e07a28c664049ed4 100644 (file)
--- a/common/trace_model.hpp
+++ b/common/trace_model.hpp
@@ -32,10 +32,10 @@
 
 
 #include <assert.h>
+#include <stdlib.h>
 
 #include <map>
 #include <vector>
-#include <iostream>
 
 
 namespace trace {
@@ -107,8 +107,6 @@ public:
     virtual const char *toString(void) const;
 
     const Value & operator[](size_t index) const;
-
-    void dump(std::ostream &os, bool color=true);
 };
 
 
@@ -332,14 +330,6 @@ protected:
 };
 
 
-inline std::ostream & operator <<(std::ostream &os, Value *value) {
-    if (value) {
-        value->dump(os);
-    }
-    return os;
-}
-
-
 typedef unsigned CallFlags;
 
 /**
@@ -444,17 +434,9 @@ public:
         assert(index < args.size());
         return *(args[index]);
     }
-
-    void dump(std::ostream &os, bool color=true);
 };
 
 
-inline std::ostream & operator <<(std::ostream &os, Call &call) {
-    call.dump(os);
-    return os;
-}
-
-
 } /* namespace trace */
 
 #endif /* _TRACE_MODEL_HPP_ */