Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge master
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_InterpolatorsFactory.cxx
diff --git
a/src/HYDROData/HYDROData_InterpolatorsFactory.cxx
b/src/HYDROData/HYDROData_InterpolatorsFactory.cxx
index 8b11eda00ee94168699e19705a9bbe8571e1ffa5..bc5da7fc40d9fe7f04bc600068604964b1de514c 100644
(file)
--- a/
src/HYDROData/HYDROData_InterpolatorsFactory.cxx
+++ b/
src/HYDROData/HYDROData_InterpolatorsFactory.cxx
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 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) 2014-2015 EDF-R&D
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
@@
-33,11
+29,11
@@
HYDROData_InterpolatorsFactory::~HYDROData_InterpolatorsFactory()
{
}
{
}
-HYDROData_IProfilesInterpolator* HYDROData_InterpolatorsFactory::GetInterpolator( const
std::s
tring& theName ) const
+HYDROData_IProfilesInterpolator* HYDROData_InterpolatorsFactory::GetInterpolator( const
TCollection_AsciiS
tring& theName ) const
{
HYDROData_IProfilesInterpolator* anInterpolator = NULL;
{
HYDROData_IProfilesInterpolator* anInterpolator = NULL;
- FactoryInterpolators::const_iterator anIt = myInterpolators.find(theName);
+ FactoryInterpolators::const_iterator anIt = myInterpolators.find(theName
.ToCString()
);
if ( anIt != myInterpolators.end() ) {
anInterpolator = anIt->second;
}
if ( anIt != myInterpolators.end() ) {
anInterpolator = anIt->second;
}
@@
-45,13
+41,13
@@
HYDROData_IProfilesInterpolator* HYDROData_InterpolatorsFactory::GetInterpolator
return anInterpolator;
}
return anInterpolator;
}
-
std::vector<std::s
tring> HYDROData_InterpolatorsFactory::GetInterpolatorNames() const
+
NCollection_Sequence<TCollection_AsciiS
tring> HYDROData_InterpolatorsFactory::GetInterpolatorNames() const
{
{
-
std::vector<std::s
tring> aNames;
+
NCollection_Sequence<TCollection_AsciiS
tring> aNames;
FactoryInterpolators::const_iterator anIt = myInterpolators.begin();
for ( ; anIt != myInterpolators.end(); anIt++ ) {
FactoryInterpolators::const_iterator anIt = myInterpolators.begin();
for ( ; anIt != myInterpolators.end(); anIt++ ) {
- aNames.
push_back( anIt->first
);
+ aNames.
Append( anIt->first.c_str()
);
}
return aNames;
}
return aNames;