[Getfem-commits] r4596 - /trunk/getfem/src/getfem/bgeot_small_vector.h

[andriy . andreykiv]

Author: andrico
Date: Wed Apr  9 19:43:10 2014
New Revision: 4596

URL: http://svn.gna.org/viewcvs/getfem?rev=4596&view=rev
Log:
another small fix

Modified:
    trunk/getfem/src/getfem/bgeot_small_vector.h

Modified: trunk/getfem/src/getfem/bgeot_small_vector.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/bgeot_small_vector.h?rev=4596&r1=4595&r2=4596&view=diff
==============================================================================
--- trunk/getfem/src/getfem/bgeot_small_vector.h        (original)
+++ trunk/getfem/src/getfem/bgeot_small_vector.h        Wed Apr  9 19:43:10 2014
@@ -325,7 +325,7 @@
     small_vector<T>& operator+=(const small_vector<T>& other) 
     {
       const_iterator b = other.begin(); iterator it = std::vector<T>::begin(); 
-      for (size_type i=0; i < size(); ++i) *it++ += *b++; 
+      for (size_type i=0; i < std::vector<T>::size(); ++i) *it++ += *b++; 
       return *this;
     }
 
@@ -334,7 +334,7 @@
     small_vector<T>& operator-=(const small_vector<T>& other) 
     { 
       const_iterator b = other.begin(); iterator it = std::vector<T>::begin();
-      for (size_type i=0; i < size(); ++i) *it++ -= *b++; 
+      for (size_type i=0; i < std::vector<T>::size(); ++i) *it++ -= *b++; 
       return *this;
     }
 
@@ -351,7 +351,7 @@
 
     void fill(T v) { for (iterator it=std::vector<T>::begin(); it != 
std::vector<T>::end(); ++it) *it = v; }
     small_vector<T>& operator<<(T x) { push_back(x); return *this; }
-    size_type memsize() const { return (size()*sizeof(T)) + sizeof(*this); }
+    size_type memsize() const { return (std::vector<T>::size()*sizeof(T)) + 
sizeof(*this); }
   };
 
 
@@ -365,7 +365,7 @@
   template<class T> inline small_vector<T>& small_vector<T>::addmul(T v, const 
small_vector<T>& other) 
   {
     const_iterator b = other.begin(); iterator it = std::vector<T>::begin();
-    for (size_type i=0; i < size(); ++i) *it++ += v * *b++; 
+    for (size_type i=0; i < std::vector<T>::size(); ++i) *it++ += v * *b++; 
     return *this;
   }