Move globalwrap.hpp to library/

include/library/globalwrap.hpp

@@ -1,5 +1,5 @@
-#ifndef _globalwrap__hpp__included__
-#define _globalwrap__hpp__included__
+#ifndef _library__globalwrap__hpp__included__
+#define _library__globalwrap__hpp__included__
 
 /**
  * Wrapper for glboal/module-local objects accessable in global ctor context.
@@ -8,6 +8,14 @@ template<class T>
 class globalwrap
 {
 public:
+/**
+ * Ctor, forces the object to be constructed (to avoid races).
+ */
+	globalwrap() throw(std::bad_alloc)
+	{
+		if(!storage)
+			storage = new T();
+	}
 /**
  * Get the wrapped object.
  *

src/core/advdumper.cpp

@@ -1,7 +1,7 @@
 #include "core/advdumper.hpp"
 #include "core/command.hpp"
 #include "core/dispatch.hpp"
-#include "core/globalwrap.hpp"
+#include "library/globalwrap.hpp"
 #include "lua/lua.hpp"
 #include "library/string.hpp"
 

src/core/command.cpp

@@ -1,5 +1,5 @@
 #include "core/command.hpp"
-#include "core/globalwrap.hpp"
+#include "library/globalwrap.hpp"
 #include "core/misc.hpp"
 #include "core/window.hpp"
 #include "library/minmax.hpp"

src/core/dispatch.cpp

@@ -1,5 +1,5 @@
 #include "core/dispatch.hpp"
-#include "core/globalwrap.hpp"
+#include "library/globalwrap.hpp"
 #include "core/misc.hpp"
 
 #include <sstream>

src/core/keymapper.cpp

@@ -1,6 +1,6 @@
 #include "core/command.hpp"
 #include "core/dispatch.hpp"
-#include "core/globalwrap.hpp"
+#include "library/globalwrap.hpp"
 #include "core/keymapper.hpp"
 #include "core/memorymanip.hpp"
 #include "core/misc.hpp"

src/core/settings.cpp

@@ -1,6 +1,6 @@
 #include "core/command.hpp"
 #include "core/dispatch.hpp"
-#include "core/globalwrap.hpp"
+#include "library/globalwrap.hpp"
 #include "core/misc.hpp"
 #include "core/settings.hpp"
 #include "library/string.hpp"

src/lua/lua.cpp

@@ -1,5 +1,5 @@
 #include "core/command.hpp"
-#include "core/globalwrap.hpp"
+#include "library/globalwrap.hpp"
 #include "lua/internal.hpp"
 #include "lua/lua.hpp"
 #include "lua/unsaferewind.hpp"