diff --git a/src/ChangeLog b/src/ChangeLog index b0b8b28811..725c03c503 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2827,7 +2827,7 @@ * lyxfunc.C: note status changed after a depth change -2003-04-04 Angus Leeming +2003-04-04 Angus Leeming * LaTeX.h: move AuxInfo operator==, != out of line. Remove LaTeX virtual destructor; nothing derives from it. diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 67d370a920..f954b1302b 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,9 @@ +2003-09-08 Angus Leeming + + * FormFiledialog.C (UserCache::add, GroupCache::add): convert + uid_t, gid_t to int to avoid compiler complaining about call to + overloaded tostr being ambiguous. + 2003-09-08 Angus Leeming * Alert_pimpl.C: diff --git a/src/frontends/xforms/FormFiledialog.C b/src/frontends/xforms/FormFiledialog.C index 325b03ab95..ad1093167a 100644 --- a/src/frontends/xforms/FormFiledialog.C +++ b/src/frontends/xforms/FormFiledialog.C @@ -116,7 +116,7 @@ private: void UserCache::add(uid_t ID) const { struct passwd const * entry = getpwuid(ID); - users[ID] = entry ? entry->pw_name : tostr(ID); + users[ID] = entry ? entry->pw_name : tostr(int(ID)); } @@ -149,7 +149,7 @@ string const & GroupCache::find(gid_t ID) const void GroupCache::add(gid_t ID) const { struct group const * entry = getgrgid(ID); - groups[ID] = entry ? entry->gr_name : tostr(ID); + groups[ID] = entry ? entry->gr_name : tostr(int(ID)); } // local instances diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog index f4bcfece06..aa3c67c34c 100644 --- a/src/graphics/ChangeLog +++ b/src/graphics/ChangeLog @@ -17,7 +17,7 @@ * *.C: strip out redundant #includes. (26 in total.) -2003-09-04 Angus Leeming +2003-09-04 Angus Leeming * LoaderQueue.C (get):