Merge pull request #685 from SaberUK/master+gnutls-rng

[user/henk/code/inspircd.git] / include / base.h

diff --git a/include/base.h b/include/base.h
index 3e868ff22e7a20ab8594d49d2841ffa6bd8c39f4..86aa2769fc3112956b3666a24708637c1720e8dc 100644 (file)
--- a/include/base.h
+++ b/include/base.h
@@ -20,12 +20,12 @@
  */
 
 
-#ifndef BASE_H
-#define BASE_H
+#pragma once
 
 #include <map>
 #include <deque>
 #include <string>
+#include <list>
 
 /** Dummy class to help enforce culls being parent-called up to classbase */
 class CullResult
@@ -121,7 +121,7 @@ class CoreExport usecountbase
 };
 
 template <typename T>
-class CoreExport reference
+class reference
 {
        T* value;
  public:
@@ -249,10 +249,11 @@ class CoreExport ServiceProvider : public classbase
        const std::string name;
        /** Type of service (must match object type) */
        const ServiceType service;
-       ServiceProvider(Module* Creator, const std::string& Name, ServiceType Type)
-               : creator(Creator), name(Name), service(Type) {}
+       ServiceProvider(Module* Creator, const std::string& Name, ServiceType Type);
        virtual ~ServiceProvider();
-};
 
+       /** If called, this ServiceProvider won't be registered automatically
+        */
+       void DisableAutoRegister();
+};
 
-#endif