mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0024859: Replace SortTools by STL equivalents
Package SortTools and its derived classes are removed; STL sort algorithms are used instead. Comparator objects are mostly reimplemented as local classes.
This commit is contained in:
@@ -23,7 +23,9 @@ package Resource
|
||||
-- initialize a variable.
|
||||
|
||||
uses
|
||||
TCollection,MMgt,SortTools,TColStd
|
||||
TCollection,
|
||||
MMgt,
|
||||
TColStd
|
||||
is
|
||||
|
||||
enumeration FormatType is
|
||||
@@ -47,11 +49,6 @@ is
|
||||
|
||||
imported DataMapIteratorOfDataMapOfAsciiStringExtendedString;
|
||||
|
||||
class QuickSortOfArray1 instantiates
|
||||
QuickSort from SortTools(AsciiString from TCollection,
|
||||
Array1OfAsciiString from TColStd,
|
||||
LexicalCompare from Resource) ;
|
||||
|
||||
---Class:
|
||||
class LexicalCompare ;
|
||||
|
||||
|
@@ -15,7 +15,6 @@
|
||||
#include <Resource_Manager.hxx>
|
||||
#include <Resource_Manager.ixx>
|
||||
#include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx>
|
||||
#include <Resource_QuickSortOfArray1.hxx>
|
||||
#include <Resource_LexicalCompare.hxx>
|
||||
|
||||
#include <OSD_Path.hxx>
|
||||
@@ -30,6 +29,8 @@
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#define END 0
|
||||
#define EMPTY 1
|
||||
#define COMMENT 2
|
||||
@@ -286,8 +287,7 @@ Standard_Boolean Resource_Manager::Save() const
|
||||
for ( Index = 1; Iter.More(); Iter.Next())
|
||||
KeyArray(Index++)= Iter.Key();
|
||||
|
||||
Resource_LexicalCompare Comp;
|
||||
Resource_QuickSortOfArray1::Sort(KeyArray, Comp);
|
||||
std::sort (KeyArray.begin(), KeyArray.end());
|
||||
|
||||
TCollection_AsciiString Line, Value;
|
||||
for (Index = 1 ; Index <= NbKey ; Index++) {
|
||||
|
Reference in New Issue
Block a user