ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-15 08:50:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Avoid compilation problem because of using standard libraries

Browse Source
This commit is contained in:
vsr 2008-03-11 12:58:16 +00:00
parent b5d171ec22
commit 2983b6f7f8
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/BasicGUI/BasicGUI_CurveDlg.cxx
View File

@ -204,7 +204,7 @@ bool BasicGUI_CurveDlg::ClickOnApply()
* \retval -1, if point not in list, else 1 in list * \retval -1, if point not in list, else 1 in list
*/ */
//================================================================================= //=================================================================================
static int isPointInList( list<GEOM::GEOM_Object_var>& thePoints, static int isPointInList( std::list<GEOM::GEOM_Object_var>& thePoints,
GEOM::GEOM_Object_var& theObject ) GEOM::GEOM_Object_var& theObject )
{ {
int len = thePoints.size(); int len = thePoints.size();
@ -213,8 +213,8 @@ static int isPointInList( list<GEOM::GEOM_Object_var>& thePoints,
return -1; return -1;
} }
for ( list<GEOM::GEOM_Object_var>::iterator i = thePoints.begin(); i != thePoints.end(); i++ ) { for ( std::list<GEOM::GEOM_Object_var>::iterator i = thePoints.begin(); i != thePoints.end(); i++ ) {
if ( string( (*i)->GetEntry() ) == string( theObject->GetEntry() ) ) { if ( std::string( (*i)->GetEntry() ) == std::string( theObject->GetEntry() ) ) {
return 1; return 1;
} }
} }
@ -229,14 +229,14 @@ static int isPointInList( list<GEOM::GEOM_Object_var>& thePoints,
* \li \a theNewPoints - not ordered sequence with necessary points * \li \a theNewPoints - not ordered sequence with necessary points
*/ */
//================================================================================= //=================================================================================
static void removeUnnecessaryPnt( list<GEOM::GEOM_Object_var>& theOldPoints, static void removeUnnecessaryPnt( std::list<GEOM::GEOM_Object_var>& theOldPoints,
GEOM::ListOfGO_var& theNewPoints ) GEOM::ListOfGO_var& theNewPoints )
{ {
list<GEOM::GEOM_Object_var> objs_to_remove; std::list<GEOM::GEOM_Object_var> objs_to_remove;
for ( list<GEOM::GEOM_Object_var>::iterator i = theOldPoints.begin(); i != theOldPoints.end(); i++ ) { for ( std::list<GEOM::GEOM_Object_var>::iterator i = theOldPoints.begin(); i != theOldPoints.end(); i++ ) {
bool found = false; bool found = false;
for ( int j = 0; j < theNewPoints->length() && !found ; j++ ) { for ( int j = 0; j < theNewPoints->length() && !found ; j++ ) {
if ( string( (*i)->GetEntry() ) == string( theNewPoints[j]->GetEntry() ) ) { if ( std::string( (*i)->GetEntry() ) == std::string( theNewPoints[j]->GetEntry() ) ) {
found = true; found = true;
} }
} }
@ -245,7 +245,7 @@ static void removeUnnecessaryPnt( list<GEOM::GEOM_Object_var>& theOldPoints,
//cout << "removed: " << (*i)->GetEntry() << endl; //cout << "removed: " << (*i)->GetEntry() << endl;
} }
} }
for ( list<GEOM::GEOM_Object_var>::iterator i = objs_to_remove.begin(); i != objs_to_remove.end(); i++ ) { for ( std::list<GEOM::GEOM_Object_var>::iterator i = objs_to_remove.begin(); i != objs_to_remove.end(); i++ ) {
theOldPoints.remove( *i ); theOldPoints.remove( *i );
} }
} }
@ -330,7 +330,7 @@ void BasicGUI_CurveDlg::SelectionIntoArgument()
myPoints->length( aList.size() ); myPoints->length( aList.size() );
int k = 0; int k = 0;
for ( list<GEOM::GEOM_Object_var>::iterator j = aList.begin(); j != aList.end(); j++ ) for ( std::list<GEOM::GEOM_Object_var>::iterator j = aList.begin(); j != aList.end(); j++ )
myPoints[k++] = *j; myPoints[k++] = *j;
if ( IOC == 0 ) if ( IOC == 0 )
@ -341,7 +341,7 @@ void BasicGUI_CurveDlg::SelectionIntoArgument()
// if ( myOrderedSel.size() == myPoints->length() ) { // if ( myOrderedSel.size() == myPoints->length() ) {
myPoints->length( myOrderedSel.size() ); myPoints->length( myOrderedSel.size() );
k = 0; k = 0;
for ( list<GEOM::GEOM_Object_var>::iterator j = myOrderedSel.begin(); j != myOrderedSel.end(); j++ ) for ( std::list<GEOM::GEOM_Object_var>::iterator j = myOrderedSel.begin(); j != myOrderedSel.end(); j++ )
myPoints[k++] = *j; myPoints[k++] = *j;
// } // }

2
src/BasicGUI/BasicGUI_CurveDlg.h
View File

@ -56,7 +56,7 @@ private:
private: private:
DlgRef_1Sel* GroupPoints; DlgRef_1Sel* GroupPoints;
GEOM::ListOfGO_var myPoints; GEOM::ListOfGO_var myPoints;
list<GEOM::GEOM_Object_var> myOrderedSel; //!< This list used for managing orderes selection std::list<GEOM::GEOM_Object_var> myOrderedSel; //!< This list used for managing orderes selection
private slots: private slots:
void ClickOnOk(); void ClickOnOk();