Changeset 257 for cpp/common/stl-util.h

Timestamp:

12/03/14 18:52:05 (9 years ago)

Author:

Maciej Komosinski

Message:

• added strmove(): strcpy() for overlapping strings
• ExtObject? operator== can handle NULL arguments
• source formatting and improved genetic operator messages

File:

• cpp/common/stl-util.h (modified) (2 diffs)

cpp/common/stl-util.h

@@ -11 +11 @@
 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]);
+        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);
+        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();
+        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;
+        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")
 
 string ssprintf(const char* format, ...);
@@ -45 +48 @@
 
 
-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);
+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()
+public:
+        std::vector<T*> vector;
+        ~DeletingVector()
         {
-        for(int i=vector.size()-1;i>=0;i--)
-                delete vector[i];
+                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);}
+        T* operator[](int i) { return vector[i]; }
+        int size() { return vector.size(); }
+        void push_back(T* x) { vector.push_back(x); }
 };