Merge remote-tracking branch 'github/master'

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

diff --git a/projects/stargazer/services_impl.h b/projects/stargazer/services_impl.h
index 8a66f63dba00d4e8d1d735d782ddfd174e0310f2..eea5e7f13094d35034924e3b302dc4881481ab39 100644 (file)
--- a/projects/stargazer/services_impl.h
+++ b/projects/stargazer/services_impl.h
@@ -22,7 +22,6 @@
 
 #include "stg/services.h"
 #include "stg/service_conf.h"
 
 #include "stg/services.h"
 #include "stg/service_conf.h"

-#include "stg/locker.h"

 #include "stg/noncopyable.h"
 #include "stg/logger.h"
 
 #include "stg/noncopyable.h"
 #include "stg/logger.h"
 


@@ -34,7 +33,7 @@
 namespace STG
 {
 
 namespace STG
 {
 

-struct Admin;
+class Admin;

 struct Store;
 
 class ServicesImpl : public Services {
 struct Store;
 
 class ServicesImpl : public Services {