From 25b4dd40deb99d2c150c200a184b70aaff6ae0d7 Mon Sep 17 00:00:00 2001
From: "Mr. eXoDia" <mr.exodia.tpodt@gmail.com>
Date: Sun, 5 Apr 2015 03:45:00 +0200
Subject: [PATCH] some forward declarations and typedefs in one place

---
 GleeBug/Debugger.Dll.h     |  2 --
 GleeBug/Debugger.Global.h  | 17 +++++++++++++++++
 GleeBug/Debugger.Process.h |  2 --
 GleeBug/Debugger.Thread.h  |  2 --
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/GleeBug/Debugger.Dll.h b/GleeBug/Debugger.Dll.h
index 413c070..6782df4 100644
--- a/GleeBug/Debugger.Dll.h
+++ b/GleeBug/Debugger.Dll.h
@@ -28,8 +28,6 @@ namespace GleeBug
 		*/
 		DllInfo(LPVOID lpBaseOfDll, DWORD sizeOfImage, LPVOID entryPoint);
 	};
-
-	typedef std::map<Range, DllInfo, RangeCompare> DllMap;
 };
 
 #endif //_DEBUGGER_DLL_H
\ No newline at end of file
diff --git a/GleeBug/Debugger.Global.h b/GleeBug/Debugger.Global.h
index 8aaa312..28f80e9 100644
--- a/GleeBug/Debugger.Global.h
+++ b/GleeBug/Debugger.Global.h
@@ -6,6 +6,8 @@
 #include <vector>
 #include <unordered_map>
 #include <map>
+#include <set>
+#include <functional>
 
 #include <windows.h>
 #include <psapi.h>
@@ -21,6 +23,21 @@ namespace GleeBug
 			return a.second < b.first;
 		}
 	};
+
+	//forward declarations
+	class Debugger;
+	class ProcessInfo;
+	class DllInfo;
+	class ThreadInfo;
+
+	//map typedefs
+	typedef std::map<DWORD, ProcessInfo> ProcessMap;
+	typedef std::map<Range, DllInfo, RangeCompare> DllMap;
+	typedef std::map<DWORD, ThreadInfo> ThreadMap;
+	
+	//callback function typedefs
+	typedef std::function<void(const Debugger &)> StepCallback;
+	
 };
 
 #endif //_DEBUGGER_GLOBAL_H
\ No newline at end of file
diff --git a/GleeBug/Debugger.Process.h b/GleeBug/Debugger.Process.h
index 402d239..ba9d690 100644
--- a/GleeBug/Debugger.Process.h
+++ b/GleeBug/Debugger.Process.h
@@ -53,8 +53,6 @@ namespace GleeBug
 		*/
 		bool MemWrite(ULONG_PTR address, const size_t size, const void* buffer);
 	};
-
-	typedef std::map<DWORD, ProcessInfo> ProcessMap;
 };
 
 #endif //_DEBUGGER_PROCESS_H
\ No newline at end of file
diff --git a/GleeBug/Debugger.Thread.h b/GleeBug/Debugger.Thread.h
index 46684d0..4c33f41 100644
--- a/GleeBug/Debugger.Thread.h
+++ b/GleeBug/Debugger.Thread.h
@@ -46,8 +46,6 @@ namespace GleeBug
 	private:
 		CONTEXT _oldContext;
 	};
-
-	typedef std::map<DWORD, ThreadInfo> ThreadMap;
 };
 
 #endif //_DEBUGGER_THREADS_H
\ No newline at end of file