Changeset 840 for cpp/common/util-string.h

Timestamp:

12/08/18 05:31:09 (5 years ago)

Author:

Maciej Komosinski

Message:

Split stl-util into util-stl, util-file and util-string

File:

• cpp/common/util-string.h (moved) (moved from cpp/common/stl-util.h) (2 diffs)

cpp/common/util-string.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef _STL_UTIL_H_
-#define _STL_UTIL_H_
+#ifndef _UTIL_STRINGS_H_
+#define _UTIL_STRINGS_H_
 
 #include "nonstd_stl.h"
 #include <stdarg.h>
-
-template<typename T, std::size_t N> void push_back(vector<T>& v, T(&d)[N])
-{
-        for (unsigned int i = 0; i < N; i++)
-                v.push_back(d[i]);
-}
-
-template<typename T> void erase(vector<T>& v, const T& e)
-{
-        typename vector<T>::iterator it = std::find(v.begin(), v.end(), e);
-        if (it != v.end())
-                v.erase(it);
-}
-
-template<typename T> void deleteVectorElements(vector<T*>& v)
-{
-        for (typename vector<T*>::iterator it = v.begin(); it != v.end(); it++)
-                delete *it;
-        v.clear();
-}
-
-template<typename T> int findIndex(vector<T>& v, const T& e)
-{
-        typename vector<T>::iterator it = find(v.begin(), v.end(), e);
-        if (it != v.end())
-                return &*it - &v.front();
-        return -1;
-}
-
 
 char* strmove(char *a, char *b); //strcpy that works well for overlapping strings ("Source and destination overlap")
@@ -48 +19 @@
 string stripFileDir(const string& filename); // strip path component from filename
 
-
-bool readCompleteFile(const char* filename, vector<char>& data, bool warn_on_missing_file = true);
-bool readCompleteFile(const char* filename, string& out, bool warn_on_missing_file = true);
-bool writeCompleteFile(const char* filename, const std::string& text, bool warn_on_fail = true);
-bool writeCompleteFile(const char* filename, vector<char>& data, bool warn_on_fail = true);
-
-template<class T> class DeletingVector  // deletes the elements (pointers) in destructor
-{
-public:
-        std::vector<T*> vector;
-        ~DeletingVector()
-        {
-                for (int i = vector.size() - 1; i >= 0; i--)
-                        delete vector[i];
-        }
-        T* operator[](int i) { return vector[i]; }
-        int size() { return vector.size(); }
-        void push_back(T* x) { vector.push_back(x); }
-};
-
 #endif