Replace STG::ARRAY with std::array.

diff --git a/include/stg/array.h b/include/stg/array.h
deleted file mode 100644 (file)
index 8550f16..0000000
--- a/include/stg/array.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef __STG_ARRAY_H__
-#define __STG_ARRAY_H__
-
-#include <cstddef> // size_t
-
-namespace STG
-{
-
-template <typename T, size_t S>
-class ARRAY
-{
-    public:
-        typedef T value_type;
-        typedef size_t size_type;
-        typedef T * iterator;
-        typedef const T * const_iterator;
-
-        ARRAY()
-        {
-            for (size_type i = 0; i < S; ++i)
-                m_data[i] = value_type();
-        }
-
-        const value_type & operator[](size_type i) const { return m_data[i]; }
-        value_type & operator[](size_type i) { return m_data[i]; }
-        size_type size() const { return S; }
-
-        iterator begin() { return &m_data[0]; }
-        const_iterator begin() const { return &m_data[0]; }
-        iterator end() { return &m_data[S + 1]; }
-        const_iterator end() const { return &m_data[S + 1]; }
-
-        const value_type & front() const { return m_data[0]; }
-        value_type & front() { return m_data[0]; }
-        const value_type & back() const { return m_data[S]; }
-        value_type & back() { return m_data[S]; }
-
-    private:
-        value_type m_data[S];
-};
-
-} // namespace STG
-
-#endif

diff --git a/libs/srvconf/include/stg/servconf_types.h b/libs/srvconf/include/stg/servconf_types.h
index 6c01d341f5e0040b55c2bf42e980ab4fbb6be5e9..07f28fc5fbda25c6ccbffa753356054a636d6142 100644 (file)
--- a/libs/srvconf/include/stg/servconf_types.h
+++ b/libs/srvconf/include/stg/servconf_types.h
@@ -21,11 +21,11 @@
 #ifndef __STG_STGLIBS_SRVCONF_TYPES_H__
 #define __STG_STGLIBS_SRVCONF_TYPES_H__
 
 #ifndef __STG_STGLIBS_SRVCONF_TYPES_H__
 #define __STG_STGLIBS_SRVCONF_TYPES_H__
 

-#include "stg/array.h"

 #include "stg/const.h" // DIR_NUM
 
 #include <string>
 #include <vector>
 #include "stg/const.h" // DIR_NUM
 
 #include <string>
 #include <vector>

+#include <array>

 #include <ctime>
 #include <cstdint>
 
 #include <ctime>
 #include <cstdint>
 


@@ -90,7 +90,7 @@ struct INFO
     int         usersNum;
     std::string uname;
     int         dirNum;
     int         usersNum;
     std::string uname;
     int         dirNum;

-    ARRAY<std::string, DIR_NUM> dirName;
+    std::array<std::string, DIR_NUM> dirName;

 };
 typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 
 };
 typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 


@@ -108,10 +108,10 @@ namespace GET_USER
 
 struct STAT
 {
 
 struct STAT
 {

-    ARRAY<long long, DIR_NUM> su;
-    ARRAY<long long, DIR_NUM> sd;
-    ARRAY<long long, DIR_NUM> mu;
-    ARRAY<long long, DIR_NUM> md;
+    std::array<long long, DIR_NUM> su;
+    std::array<long long, DIR_NUM> sd;
+    std::array<long long, DIR_NUM> mu;
+    std::array<long long, DIR_NUM> md;

 };
 
 struct INFO
 };
 
 struct INFO


@@ -143,7 +143,7 @@ struct INFO
     STAT        stat;
     time_t      pingTime;
     time_t      lastActivityTime;
     STAT        stat;
     time_t      pingTime;
     time_t      lastActivityTime;

-    ARRAY<std::string, USERDATA_NUM> userData;
+    std::array<std::string, USERDATA_NUM> userData;

     std::vector<std::string> services;
     std::vector<std::string> authBy;
 };
     std::vector<std::string> services;
     std::vector<std::string> authBy;
 };