Merge branch 'master' into full-month-stats

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

diff --git a/projects/stargazer/corps_impl.h b/projects/stargazer/corps_impl.h
index ad705c54a830f00ecb8c87f3e03e0b7972cd28d2..e4552424219c72e3aab74b25dacb69649456451f 100644 (file)
--- a/projects/stargazer/corps_impl.h
+++ b/projects/stargazer/corps_impl.h
@@ -48,23 +48,28 @@ public:
     bool Exists(const std::string & name) const;
     const std::string & GetStrError() const { return strError; }
 
     bool Exists(const std::string & name) const;
     const std::string & GetStrError() const { return strError; }
 

+    size_t Count() const { return data.size(); }
+

     int OpenSearch() const;
     int SearchNext(int, CORP_CONF * corp) const;
     int CloseSearch(int) const;
 
 private:
     int OpenSearch() const;
     int SearchNext(int, CORP_CONF * corp) const;
     int CloseSearch(int) const;
 
 private:

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

     typedef list<CORP_CONF>::iterator       crp_iter;
     typedef list<CORP_CONF>::const_iterator const_crp_iter;
 
     bool Read();
 
     std::list<CORP_CONF> data;
     typedef list<CORP_CONF>::iterator       crp_iter;
     typedef list<CORP_CONF>::const_iterator const_crp_iter;
 
     bool Read();
 
     std::list<CORP_CONF> data;

-    STORE *                 store;
-    STG_LOGGER &            WriteServLog;
+    STORE * store;
+    STG_LOGGER & WriteServLog;

     mutable std::map<int, const_crp_iter> searchDescriptors;
     mutable std::map<int, const_crp_iter> searchDescriptors;

-    mutable unsigned int    handle;
+    mutable unsigned int handle;

     mutable pthread_mutex_t mutex;
     mutable pthread_mutex_t mutex;

-    std::string             strError;
+    std::string strError;

 };
 
 #endif
 };
 
 #endif