Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright update: 2016
[modules/smesh.git]
/
src
/
StdMeshers_I
/
StdMeshers_CartesianParameters3D_i.cxx
diff --git
a/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx
b/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx
index 9ca0a8ee8e58b6975e7fb2b0522aef0d6d91d10b..b8b54ddbc4574617dce497b7ccb03891095fdbaa 100644
(file)
--- a/
src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx
+++ b/
src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-178,8
+178,8
@@
void StdMeshers_CartesianParameters3D_i::SetGridSpacing(const SMESH::string_arra
CORBA::Short axis)
throw (SALOME::SALOME_Exception)
{
CORBA::Short axis)
throw (SALOME::SALOME_Exception)
{
-
vector<
string> funVec;
-
vector<double>
pointVec;
+
std::vector<std::
string> funVec;
+
std::vector<double>
pointVec;
_array2vec( spaceFunctions, funVec, (const char*) );
_array2vec( internalPoints, pointVec, );
_array2vec( spaceFunctions, funVec, (const char*) );
_array2vec( internalPoints, pointVec, );
@@
-209,8
+209,8
@@
void StdMeshers_CartesianParameters3D_i::GetGridSpacing(SMESH::string_array_out
{
ASSERT( myBaseImpl );
try {
{
ASSERT( myBaseImpl );
try {
-
vector<
string> funVec;
-
vector<double>
pointVec;
+
std::vector<std::
string> funVec;
+
std::vector<double>
pointVec;
this->GetImpl()->GetGridSpacing( funVec, pointVec, axis );
xSpaceFunctions = new SMESH::string_array();
this->GetImpl()->GetGridSpacing( funVec, pointVec, axis );
xSpaceFunctions = new SMESH::string_array();
@@
-394,8
+394,8
@@
StdMeshers_CartesianParameters3D_i::ComputeCoordinates(CORBA::Double
const char* axisName )
throw (SALOME::SALOME_Exception)
{
const char* axisName )
throw (SALOME::SALOME_Exception)
{
-
vector<
string> xFuns;
-
vector<double>
xPoints, coords;
+
std::vector<std::
string> xFuns;
+
std::vector<double>
xPoints, coords;
_array2vec( spaceFuns, xFuns, (const char*) );
_array2vec( points, xPoints, );
_array2vec( spaceFuns, xFuns, (const char*) );
_array2vec( points, xPoints, );