summaryrefslogtreecommitdiffstats
path: root/devel/fam/files
diff options
context:
space:
mode:
authoralane <alane@FreeBSD.org>2002-09-10 14:14:02 +0000
committeralane <alane@FreeBSD.org>2002-09-10 14:14:02 +0000
commite7ce96991bb787bbd71bbfb5e0727543a3e4ae60 (patch)
tree81c8a25b14d74c0f802462bc6c8ccf39845b327c /devel/fam/files
parent8c6387c5990025e486e9902737a278fdb7e149f7 (diff)
downloadFreeBSD-ports-e7ce96991bb787bbd71bbfb5e0727543a3e4ae60.zip
FreeBSD-ports-e7ce96991bb787bbd71bbfb5e0727543a3e4ae60.tar.gz
Include std:: prefix on references to string class for gcc 3.2, which is
pickier that 2.95.x. It's really also the right way to do the code ...
Diffstat (limited to 'devel/fam/files')
-rw-r--r--devel/fam/files/mntent_compat.c++12
1 files changed, 6 insertions, 6 deletions
diff --git a/devel/fam/files/mntent_compat.c++ b/devel/fam/files/mntent_compat.c++
index 947a1ed..ae87680 100644
--- a/devel/fam/files/mntent_compat.c++
+++ b/devel/fam/files/mntent_compat.c++
@@ -42,7 +42,7 @@ struct statfs *G_pmntstat = 0;
struct optmap {
int fl;
- string st;
+ std::string st;
};
static struct optmap omap[] = {
@@ -84,7 +84,7 @@ mntent::from_statfs(struct statfs *pst)
strcpy(mnt_type, pst->f_fstypename);
mnt_freq = mnt_passno = 0;
- string opts;
+ std::string opts;
int fl = pst->f_flags;
opts += (fl & MNT_RDONLY) ? "ro" : "rw";
@@ -118,11 +118,11 @@ setmntent(const char *, char *)
char *
hasmntopt(const mntent *pmnt, const char *szopt)
{
- string opt(szopt);
- string mntopts(pmnt->mnt_opts);
+ std::string opt(szopt);
+ std::string mntopts(pmnt->mnt_opts);
- string::size_type pos = mntopts.find(opt);
- const char *szret = (pos == string::npos) ? "" : pmnt->mnt_opts + pos;
+ std::string::size_type pos = mntopts.find(opt);
+ const char *szret = (pos == std::string::npos) ? "" : pmnt->mnt_opts + pos;
return const_cast<char *>(szret);
}
OpenPOWER on IntegriCloud