debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DtMmdb: replace ostring with std::string.

Browse Source
This commit is contained in:
hyousatsu
2024-07-05 06:06:27 -04:00
parent ba49a9e161
commit c79224b367
26 changed files with 71 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cde/lib/DtMmdb/mgrs/misc.C
View File

@@ -62,7 +62,7 @@ debug(cerr, y -> v_name);
*/
return ( x -> v_name.string_LS(y -> v_name) );
return ( x -> v_name.compare(y -> v_name) < 0);
}
Boolean name_oid_eq(const void* o1, const void* o2)
@@ -75,7 +75,7 @@ MESSAGE(cerr, "in name_oid_eq");
debug(cerr, x -> v_name);
debug(cerr, y -> v_name);
*/
return ( x -> v_name.string_EQ(y -> v_name) );
return ( x -> v_name.compare(y -> v_name) == 0);
}
Boolean oid_ls(const void* o1, const void* o2)
@@ -145,15 +145,14 @@ void delete_name_oid_rec_f(const void* name_oid_ptr)
//
// ***************************************************
mark_t::mark_t(char* marks) : ostring(strlen(marks))
mark_t::mark_t(char* marks) : string(marks)
{
set(marks);
}
istream& operator >>(istream& in, mark_t& m)
{
char c ;
char* ptr = m.get();
const char* ptr = m.c_str();
Boolean read_marks = false;
while ( in && in.get(c) ) {
@@ -175,7 +174,7 @@ istream& operator >>(istream& in, mark_t& m)
ostream& operator <<(ostream& out, mark_t& m)
{
out << m.get();
out << m.c_str();
return out ;
}