From: John L. <mov...@us...> - 2002-01-07 08:49:46
|
Update of /cvsroot/oprofile/oprofile/util In directory usw-pr-cvs1:/tmp/cvs-serv29656/util Modified Files: file_manip.cpp file_manip.h string_manip.h Log Message: gcc 3.0 and std:: - incomplete ... Index: file_manip.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/util/file_manip.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- file_manip.cpp 2001/12/29 23:51:25 1.6 +++ file_manip.cpp 2002/01/07 08:49:42 1.7 @@ -24,6 +24,7 @@ #include <fnmatch.h> #include <vector> +#include <iostream> #include <string> #include <algorithm> @@ -36,6 +37,8 @@ using std::string; using std::list; using std::find; +using std::cerr; +using std::endl; /** * is_file_identical - check for identical files Index: file_manip.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/util/file_manip.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- file_manip.h 2001/12/29 23:51:25 1.7 +++ file_manip.h 2002/01/07 08:49:42 1.8 @@ -39,14 +39,14 @@ std::string dirname(std::string const & file_name); std::string basename(std::string const & path_name); // extract the mangled name of an application and the shared lib name -std::string extract_app_name(const string & name, string & lib_name); +std::string extract_app_name(const std::string & name, std::string & lib_name); // get a file list of valid sample filename from base_dir filtered by // by filter. The #counter_nr suffix are stripepd before creating the // list -void get_sample_file_list(list<string> & file_list, +void get_sample_file_list(std::list<std::string> & file_list, const std::string & base_dir, const std::string & filter); // return filename stripped of the #counter_nr suffix -string strip_filename_suffix(const std::string & filename); +std::string strip_filename_suffix(const std::string & filename); #endif /* !FILE_MANIP_H */ Index: string_manip.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/util/string_manip.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- string_manip.h 2001/12/23 21:15:10 1.3 +++ string_manip.h 2002/01/07 08:49:42 1.4 @@ -22,8 +22,8 @@ #include <string> #include <vector> -string erase_from_last_of(string const & str, char ch); -string erase_to_last_of(string const & str, char ch); +std::string erase_from_last_of(std::string const & str, char ch); +std::string erase_to_last_of(std::string const & str, char ch); std::string rtrim(std::string const & str, char ch); @@ -31,7 +31,7 @@ std::string tostr(unsigned int i); /// separate_token - separate a list of token -void separate_token(std::vector<std::string> & result, const string & str, +void separate_token(std::vector<std::string> & result, const std::string & str, char sep); #endif /* !STRING_MANIP_H */ |