Merge pull request #2 from bobr-kun/MySQL_custom_port

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

diff --git a/projects/stargazer/store_loader.h b/projects/stargazer/store_loader.h
index a9bb3a449d8b6cabe33a8048895b06ce2eed9a54..39d35e3ee73b15e40dbc16326a2d8679e9eb9c85 100644 (file)
--- a/projects/stargazer/store_loader.h
+++ b/projects/stargazer/store_loader.h
@@ -15,7 +15,7 @@
  */
 
 /*
  */
 
 /*

- *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
+ *    Author : Maksym Mamontov <stg@madf.info>

  */
 
 /*
  */
 
 /*


@@ -31,26 +31,30 @@
 #ifndef __STORE_LOADER_H__
 #define __STORE_LOADER_H__
 
 #ifndef __STORE_LOADER_H__
 #define __STORE_LOADER_H__
 

-#include <string>
+#include "stg/module_settings.h"
+#include "stg/noncopyable.h"

 
 

-#include "module_settings.h"
-#include "noncopyable.h"
+#include <string>

 
 class STORE;
 class SETTINGS_IMPL;
 
 class STORE_LOADER : private NONCOPYABLE {
 public:
 
 class STORE;
 class SETTINGS_IMPL;
 
 class STORE_LOADER : private NONCOPYABLE {
 public:

-    STORE_LOADER(const SETTINGS_IMPL & settings);
+    explicit STORE_LOADER(const SETTINGS_IMPL & settings);

     ~STORE_LOADER();
 
     bool Load();
     bool Unload();
 
     ~STORE_LOADER();
 
     bool Load();
     bool Unload();
 

-    STORE * GetStore() { return plugin; }
+    STORE & GetStore() { return *plugin; }

 
     const std::string & GetStrError() const { return errorStr; }
 
     const std::string & GetStrError() const { return errorStr; }

+

 private:
 private:

+    STORE_LOADER(const STORE_LOADER & rvalue);
+    STORE_LOADER & operator=(const STORE_LOADER & rvalue);
+

     bool isLoaded;
     void * handle;
     STORE * plugin;
     bool isLoaded;
     void * handle;
     STORE * plugin;