Clean up queue implementation, fix namespaces

1 files changed, 20 insertions, 9 deletions

diff --git a/mmss/types.hpp b/mmss/types.hpp
index 52ace0f..e8a63cc 100644
--- a/mmss/types.hpp
+++ b/mmss/types.hpp
@@ -24,19 +24,30 @@
 */
 
 
-#ifndef _GMRF_MMSS_TYPES_H_
-#define _GMRF_MMSS_TYPES_H_
+#ifndef _GMRF_MMSS_TYPES_HPP_
+#define _GMRF_MMSS_TYPES_HPP_
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
 
-typedef struct mmss mmss_t;
-typedef struct mmss_config mmss_config_t;
-typedef struct mmss_network mmss_network_t;
-typedef struct mmss_packet mmss_packet_t;
-typedef struct mmss_scheduled mmss_scheduled_t;
+extern "C" {
 
-typedef struct mmss_string_stack mmss_string_stack_t;
+#include <gmrf/gmrf.h>
+#include <mmss/protocol.h>
 
-#endif /* _GMRF_MMSS_TYPES_H_ */
+}
+
+namespace MMSS {
+
+class context_t;
+class config_t;
+class network_t;
+class packet_t;
+class scheduled_t;
+
+typedef ::mmss_protocol_t protocol_t;
+
+}
+
+#endif /* _GMRF_MMSS_TYPES_HPP_ */