0026262: mixing qvector.h and math_Memory.hxx won't compile

Files math_Memory.cxx and .hxx removed: function memmove() should be available on all modern platforms in standard C library

diff --git a/src/BlendFunc/BlendFunc_Tensor.cxx b/src/BlendFunc/BlendFunc_Tensor.cxx
index fa27c5280d3c753dcb77063fc6dd63f1cbf21483..b1c228c65504aa9819eed480f7dca56efee7b6f8 100644 (file)
--- a/src/BlendFunc/BlendFunc_Tensor.cxx
+++ b/src/BlendFunc/BlendFunc_Tensor.cxx
@@ -19,8 +19,6 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <math_Vector.hxx>
 #include <math_Matrix.hxx>
-//#include <math_StackMemoryManager.hxx>
-//#include <math_Memory.hxx>
 
 BlendFunc_Tensor::BlendFunc_Tensor(const Standard_Integer NbRow, 
                                   const Standard_Integer NbCol, 

diff --git a/src/math/FILES b/src/math/FILES
index e608228a2a47ac9207754da4686c3f08e705e8b1..ed05a9c4d92cb7ea9217109de2cd4682faa4ae8f 100755 (executable)
--- a/src/math/FILES
+++ b/src/math/FILES
@@ -1,6 +1,4 @@
-math_Memory.cxx
 math_Recipes.cxx
-math_Memory.hxx
 math_Recipes.hxx
 math_GaussPoints.hxx
 math_Kronrod.cxx

diff --git a/src/math/math_DoubleTab.cxx b/src/math/math_DoubleTab.cxx
index 429abf8657f05bc89362b28771f4dc41e18658ba..5dc5efa2f985e89f1c18ba988d69f9912aaa6c4d 100644 (file)
--- a/src/math/math_DoubleTab.cxx
+++ b/src/math/math_DoubleTab.cxx
@@ -15,7 +15,6 @@
 // Lpa, le 7/02/92
 #include <math_DoubleTab.ixx>
 
-#include <math_Memory.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_Integer.hxx>

diff --git a/src/math/math_DoubleTab.lxx b/src/math/math_DoubleTab.lxx
index 45e3c107c0b3a8cc79a33e2a641dee80a6f1b526..c6fefb4980b6144f27c8a8668f1602aeed209bf4 100644 (file)
--- a/src/math/math_DoubleTab.lxx
+++ b/src/math/math_DoubleTab.lxx
@@ -14,7 +14,8 @@
 
 // Lpa, le 7/02/92
 
-#include <math_Memory.hxx>
+#include <string.h>
+
 #include <Standard_OutOfRange.hxx>
 
 inline Standard_Real& math_DoubleTab::Value (const Standard_Integer RowIndex,

diff --git a/src/math/math_Memory.cxx b/src/math/math_Memory.cxx
deleted file mode 100644 (file)
index 7847219..0000000
--- a/src/math/math_Memory.cxx
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 1997-1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <math_Memory.hxx>
-
-void *reverse_move(void *s1, void *s2, int size) {
-
-   for(int i = size - 1; i >= 0; i--) {
-     *((char *)s1 + i) = *((char *)s2 + i);
-   }
-   return s1;
-}

diff --git a/src/math/math_Memory.hxx b/src/math/math_Memory.hxx
deleted file mode 100644 (file)
index 9786bb0..0000000
--- a/src/math/math_Memory.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 1997-1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef math_Memory_HeaderFile 
-#define math_Memory_HeaderFile 
-
-#include <string.h>
-
-// uniquement parce que memmove n'existe pas sur SUN
-#ifndef WNT
-void *reverse_move(void *s1, void *s2, int size);
-
-inline void *memmove(void *s1, void *s2, int size) {
-
-/*
-     void *result;
-
-     if(s2 < s1) {
-       result = reverse_move(s1, s2, size);
-     }
-     else {
-       result = memcpy(s1, s2, size);
-     }      
-     return result;
-*/
-     return memcpy(s1, s2, size);
-   }
-#endif
-#endif

diff --git a/src/math/math_SingleTab.hxx b/src/math/math_SingleTab.hxx
index 9b6ffd5a82b92f97ee771b58cfd5c0d3bc865846..596646c8aa5e9b2c698e3c296a46b8164b70e260 100644 (file)
--- a/src/math/math_SingleTab.hxx
+++ b/src/math/math_SingleTab.hxx
@@ -15,10 +15,11 @@
 #ifndef _math_SingleTab_HeaderFile
 #define _math_SingleTab_HeaderFile
 
-#include <math_Memory.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Failure.hxx>
 
+#include <string.h>
+
 static const Standard_Integer aLengthOfBuf = 512;
 
 template<class T> class math_SingleTab