Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / projects / stargazer / store_loader.h

diff --git a/projects/stargazer/store_loader.h b/projects/stargazer/store_loader.h
index a9bb3a449d8b6cabe33a8048895b06ce2eed9a54..5245eb572f8c42f8091edc55657ee0fe30238faa 100644 (file)
--- a/projects/stargazer/store_loader.h
+++ b/projects/stargazer/store_loader.h
@@ -33,8 +33,8 @@
 
 #include <string>
 
-#include "module_settings.h"
-#include "noncopyable.h"
+#include "stg/module_settings.h"
+#include "stg/noncopyable.h"
 
 class STORE;
 class SETTINGS_IMPL;
@@ -47,10 +47,14 @@ public:
     bool Load();
     bool Unload();
 
-    STORE * GetStore() { return plugin; }
+    STORE & GetStore() { return *plugin; }
 
     const std::string & GetStrError() const { return errorStr; }
+
 private:
+    STORE_LOADER(const STORE_LOADER & rvalue);
+    STORE_LOADER & operator=(const STORE_LOADER & rvalue);
+
     bool isLoaded;
     void * handle;
     STORE * plugin;