OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code

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

Browse Source 
Files math_Memory.cxx and .hxx removed: function memmove() should be available on all modern platforms in standard C library
This commit is contained in:
abv 2015-05-25 11:21:59 +03:00
parent 9f1bb68f68
commit 5b27fad6ce
7 changed files with 4 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BlendFunc/BlendFunc_Tensor.cxx
View File

@ -19,8 +19,6 @@
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
#include <math_Vector.hxx> #include <math_Vector.hxx>
#include <math_Matrix.hxx> #include <math_Matrix.hxx>
//#include <math_StackMemoryManager.hxx>
//#include <math_Memory.hxx>
BlendFunc_Tensor::BlendFunc_Tensor(const Standard_Integer NbRow, BlendFunc_Tensor::BlendFunc_Tensor(const Standard_Integer NbRow,
const Standard_Integer NbCol, const Standard_Integer NbCol,

2
src/math/FILES
View File

@ -1,6 +1,4 @@
math_Memory.cxx
math_Recipes.cxx math_Recipes.cxx
math_Memory.hxx
math_Recipes.hxx math_Recipes.hxx
math_GaussPoints.hxx math_GaussPoints.hxx
math_Kronrod.cxx math_Kronrod.cxx

1
src/math/math_DoubleTab.cxx
View File

@ -15,7 +15,6 @@
// Lpa, le 7/02/92 // Lpa, le 7/02/92
#include <math_DoubleTab.ixx> #include <math_DoubleTab.ixx>
#include <math_Memory.hxx>
#include <Standard_OutOfRange.hxx> #include <Standard_OutOfRange.hxx>
#include <Standard_Failure.hxx> #include <Standard_Failure.hxx>
#include <Standard_Integer.hxx> #include <Standard_Integer.hxx>

3
src/math/math_DoubleTab.lxx
View File

@ -14,7 +14,8 @@
// Lpa, le 7/02/92 // Lpa, le 7/02/92
#include <math_Memory.hxx> #include <string.h>
#include <Standard_OutOfRange.hxx> #include <Standard_OutOfRange.hxx>
inline Standard_Real& math_DoubleTab::Value (const Standard_Integer RowIndex, inline Standard_Real& math_DoubleTab::Value (const Standard_Integer RowIndex,

23
src/math/math_Memory.cxx
View File

@ -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;
}

40
src/math/math_Memory.hxx
View File

@ -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

3
src/math/math_SingleTab.hxx
View File

@ -15,10 +15,11 @@
#ifndef _math_SingleTab_HeaderFile #ifndef _math_SingleTab_HeaderFile
#define _math_SingleTab_HeaderFile #define _math_SingleTab_HeaderFile
#include <math_Memory.hxx>
#include <Standard_OutOfRange.hxx> #include <Standard_OutOfRange.hxx>
#include <Standard_Failure.hxx> #include <Standard_Failure.hxx>
#include <string.h>
static const Standard_Integer aLengthOfBuf = 512; static const Standard_Integer aLengthOfBuf = 512;
template<class T> class math_SingleTab template<class T> class math_SingleTab