From 1c8309fd42d667d2f8c96ff61ddced29c8c0c82b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jose.r.fonseca@gmail.com>
Date: Sat, 28 May 2011 13:33:32 +0100
Subject: [PATCH] Move signatures to trace_model.hpp where they belong.

---
 trace_model.hpp  | 41 +++++++++++++++++++++++++++++++++++++++--
 trace_writer.hpp | 35 +++--------------------------------
 2 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/trace_model.hpp b/trace_model.hpp
index 03a2389..b3a118a 100644
--- a/trace_model.hpp
+++ b/trace_model.hpp
@@ -38,12 +38,49 @@
 #include <vector>
 #include <iostream>
 
-#include "trace_writer.hpp"
-
 
 namespace Trace {
 
 
+typedef unsigned Id;
+
+
+struct FunctionSig {
+    Id id;
+    const char *name;
+    unsigned num_args;
+    const char **arg_names;
+};
+
+
+struct StructSig {
+    Id id;
+    const char *name;
+    unsigned num_members;
+    const char **member_names;
+};
+
+
+struct EnumSig {
+    Id id;
+    const char *name;
+    signed long long value;
+};
+
+
+struct BitmaskFlag {
+    const char *name;
+    unsigned long long value;
+};
+
+
+struct BitmaskSig {
+    Id id;
+    unsigned num_flags;
+    const BitmaskFlag *flags;
+};
+
+
 class Visitor;
 
 
diff --git a/trace_writer.hpp b/trace_writer.hpp
index 3b7955e..9d07150 100644
--- a/trace_writer.hpp
+++ b/trace_writer.hpp
@@ -30,44 +30,15 @@
 #ifndef _TRACE_WRITER_HPP_
 #define _TRACE_WRITER_HPP_
 
+
 #include <stddef.h>
 
 #include <vector>
 
-namespace Trace {
-
-    typedef unsigned Id;
-
-    struct FunctionSig {
-        Id id;
-        const char *name;
-        unsigned num_args;
-        const char **arg_names;
-    };
-
-    struct StructSig {
-        Id id;
-        const char *name;
-        unsigned num_members;
-        const char **member_names;
-    };
-
-    struct EnumSig {
-        Id id;
-        const char *name;
-        signed long long value;
-    };
+#include "trace_model.hpp"
 
-    struct BitmaskFlag {
-        const char *name;
-        unsigned long long value;
-    };
 
-    struct BitmaskSig {
-        Id id;
-        unsigned num_flags;
-        const BitmaskFlag *flags;
-    };
+namespace Trace {
 
     class Writer {
     protected:
-- 
2.45.2