Changeset 257 in Sophya for trunk/SophyaLib/BaseTools/ndatablock.h

Timestamp:

Apr 23, 1999, 2:49:50 PM (26 years ago)

Author:

ansari

Message:

version qui compile cmv 23/4/99

File:

• trunk/SophyaLib/BaseTools/ndatablock.h (modified) (3 diffs)

trunk/SophyaLib/BaseTools/ndatablock.h

@@ -30 +30 @@
   inline void SetTemp(bool temp) {mIsTemp=temp;}
 
-  // Gestion taille
+  // Gestion taille/Remplissage
   void Clone(NDataBlock<T>& a);
   void ReSize(size_t n);
+  void FillFrom(size_t n,T* data);
   
   // Informations pointeur/data
@@ -62 +63 @@
   NDataBlock<T>& operator /= (NDataBlock<T>& a);
 
+  NDataBlock<T>& Add(T b);
+  NDataBlock<T>& Sub(T b);
+  NDataBlock<T>& SubInv(T b);
+  NDataBlock<T>& Mul(T b);
+  NDataBlock<T>& Div(T b);
+  NDataBlock<T>& DivInv(T b);
+
+  NDataBlock<T>& Add(const NDataBlock<T>& b);
+  NDataBlock<T>& Sub(const NDataBlock<T>& b);
+  NDataBlock<T>& SubInv(const NDataBlock<T>& b);
+  NDataBlock<T>& Mul(const NDataBlock<T>& b);
+  NDataBlock<T>& Div(const NDataBlock<T>& b);
+  NDataBlock<T>& DivInv(const NDataBlock<T>& b);
 
 protected:
@@ -77 +91 @@
 
 
-template<class T> NDataBlock<T> operator + (const NDataBlock<T>& a, T b);
-template<class T> NDataBlock<T> operator + (T b,const NDataBlock<T>& a);
-template<class T> NDataBlock<T> operator - (const NDataBlock<T>& a, T b);
-template<class T> NDataBlock<T> operator - (T b,const NDataBlock<T>& a);
-template<class T> NDataBlock<T> operator * (const NDataBlock<T>& a, T b);
-template<class T> NDataBlock<T> operator * (T b, const NDataBlock<T>& a);
-template<class T> NDataBlock<T> operator / (const NDataBlock<T>& a, T b);
+template<class T> inline NDataBlock<T> operator + (const NDataBlock<T>& a,T b)
+                                                  {return a.Add(b);}
+template<class T> inline NDataBlock<T> operator + (T b,const NDataBlock<T>& a)
+                                                  {return a.Add(b);}
+template<class T> inline NDataBlock<T> operator - (const NDataBlock<T>& a,T b)
+                                                  {return a.Sub(b);}
+template<class T> inline NDataBlock<T> operator - (T b,const NDataBlock<T>& a)
+                                                  {return a.SubInv(b);}
+template<class T> inline NDataBlock<T> operator * (const NDataBlock<T>& a,T b)
+                                                  {return a.Mul(b);}
+template<class T> inline NDataBlock<T> operator * (T b,const NDataBlock<T>& a)
+                                                  {return a.Mul(b);}
+template<class T> inline NDataBlock<T> operator / (const NDataBlock<T>& a,T b)
+                                                  {return a.Div(b);}
+template<class T> inline NDataBlock<T> operator / (T b,const NDataBlock<T>& a)
+                                                  {return a.DivInv(b);}
 
-template<class T> NDataBlock<T> operator + (const NDataBlock<T>& a, const NDataBlock<T>& b);
-template<class T> NDataBlock<T> operator - (const NDataBlock<T>& a, const NDataBlock<T>& b);
-template<class T> NDataBlock<T> operator * (const NDataBlock<T>& a, const NDataBlock<T>& b);
-template<class T> NDataBlock<T> operator / (const NDataBlock<T>& a, const NDataBlock<T>& b);
+template<class T> inline NDataBlock<T> operator + (const NDataBlock<T>& a,const NDataBlock<T>& b)
+                                                  {return a.Add(b);}
+template<class T> inline NDataBlock<T> operator - (const NDataBlock<T>& a,const NDataBlock<T>& b)
+                                                  {return a.Sub(b);}
+template<class T> inline NDataBlock<T> operator * (const NDataBlock<T>& a,const NDataBlock<T>& b)
+                                                  {return a.Mul(b);}
+template<class T> inline NDataBlock<T> operator / (const NDataBlock<T>& a,const NDataBlock<T>& b)
+                                                  {return a.Div(b);}
+
 
 #endif