This is the mail archive of the
sid@sources.redhat.com
mailing list for the SID project.
compile fix patch
- To: sid at sources dot redhat dot com
- Subject: compile fix patch
- From: Harri Porten <porten at kde dot org>
- Date: Sat, 14 Apr 2001 23:19:40 +0200
Hi !
The attached patch fixes a compile problem with today's sid sources.
Simply prefixes string and vector with the std namespace where missing.
Harri.
Index: include/ChangeLog
===================================================================
RCS file: /cvs/src/src/sid/include/ChangeLog,v
retrieving revision 1.9
diff -u -3 -p -r1.9 ChangeLog
--- ChangeLog 2001/03/28 19:36:17 1.9
+++ ChangeLog 2001/04/14 21:17:29
@@ -1,3 +1,7 @@
+2001-04-14 Harri Porten <porten@kde.org>
+
+ * sidmiscutil.h (sidutil): added std:: prefixes for C++ ISO compliance.
+
2001-03-28 Dave Brolley <brolley@redhat.com>
* sidbusutil.h (mux_passthrough_bus::select_bus): New function.
Index: include/sidmiscutil.h
===================================================================
RCS file: /cvs/src/src/sid/include/sidmiscutil.h,v
retrieving revision 1.2
diff -u -3 -p -r1.2 sidmiscutil.h
--- sidmiscutil.h 2001/03/26 19:18:40 1.2
+++ sidmiscutil.h 2001/04/14 21:17:30
@@ -313,7 +313,7 @@ namespace sidutil
inline std::vector<std::string>
sid_file_search_path ()
{
- vector<string> search_directories;
+ std::vector<std::string> search_directories;
char* slp = getenv ("SID_LIBRARY_PATH"); // run-time configuration
if (slp)
@@ -337,10 +337,10 @@ namespace sidutil
if (!sep) sep = SID_EXEC_PREFIX; // build-time configuration
// We really just want to get to pkgdatadir, which is $prefix/share
// Guess exec-prefix == prefix
- string pkglibdir1 = string(sep) + string("/share");
+ std::string pkglibdir1 = std::string(sep) + std::string("/share");
search_directories.push_back (pkglibdir1);
// Guess exec-prefix == prefix/H-HOST
- string pkglibdir2 = string(sep) + string("/../share");
+ std::string pkglibdir2 = std::string(sep) + std::string("/../share");
search_directories.push_back (pkglibdir2);
return search_directories;
@@ -355,9 +355,9 @@ namespace sidutil
std::vector<std::string> file_path = sid_file_search_path ();
std::vector<std::string> path;
- path.push_back (string("")); // no prefix
+ path.push_back (std::string("")); // no prefix
for (unsigned i=0; i<file_path.size(); i++)
- path.push_back (file_path[i] + string("/sid/"));
+ path.push_back (file_path[i] + std::string("/sid/"));
for (unsigned i=0; i<path.size(); i++)
{