Changeset 7cc3fd in git for gfanlib/gfanlib_vector.h

Timestamp:

Aug 8, 2016, 2:16:42 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0d1bcb7165ef371658ad444b7547d9fdf53d7136

Parents:

6a97c544535256c37da0f10bcb6821b592546c6815813d0947d4221b8c060256fd6994a48e3c6605

Message:

t push origin spielwieseMerge branch 'YueRen-gfanlib0.6' into spielwiese

File:

• gfanlib/gfanlib_vector.h (modified) (5 diffs)

gfanlib/gfanlib_vector.h

@@ -72 +72 @@
   // Access
   //--------
-  typ& operator[](int n)
+  typ& operator[](int n)__attribute__((always_inline))
     {
       if(!(n>=0 && n<(int)v.size()))outOfRange(n,v.size());
       return (v[n]);
     }
-  const typ& operator[](int n)const{assert(n>=0 && n<(int)v.size());return (v[n]);}
-  const typ& UNCHECKEDACCESS(int n)const{return (v[n]);}
+  const typ& operator[](int n)const __attribute__((always_inline)){assert(n>=0 && n<(int)v.size());return (v[n]);}
+  typ& UNCHECKEDACCESS(int n)__attribute__((always_inline)){return (v[n]);}
+  const typ& UNCHECKEDACCESS(int n)const __attribute__((always_inline)){return (v[n]);}
 
   //-------------
@@ -85 +86 @@
   unsigned int size()const{return v.size();};
   void resize(int n){v.resize(n,typ());};
-  void grow(int i){if((int)size()<i)resize(i);}
+  void grow(int i){if(size()<i)resize(i);}
   void push_back(typ a)
   {
@@ -293 +294 @@
   std::string toString()const
   {
-    std::stringstream f;
-    f<<*this;
-    return f.str();
+          std::stringstream f;
+          f<<*this;
+          return f.str();
   }
 
   typ gcd()const
   {
+    typ temp1,temp2;
     typ ret(1);
     for(unsigned i=0;i<size();i++)
-      ret=typ::gcd(ret,v[i]);
+      ret=typ::gcd(ret,v[i],temp1,temp2);
     return ret;
   }
@@ -309 +311 @@
     assert(!typ::isField());
     return (*this)/gcd();
-  }
-
-  void debugPrint()const
-  {
-    std::stringstream s;
-    s<<"(";
-    for(typename std::vector<typ>::const_iterator i=this->v.begin();i!=this->v.end();i++)
-    {
-      if(i!=this->v.begin()) s<<",";
-      s<<*i;
-    }
-    s<<")"<<std::endl;
-    std::cout << s.str();
-    return;
   }
 };
@@ -415 +403 @@
 
     return ret;
-};
-
-};
+}
+
+}
 
 #endif /* LIB_ZVECTOR_H_ */