Convert uid_t, gid_t to int before calling tostr.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7709 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index b0b8b288116b35f5c8d421874ddf8c8d36bc50f4..725c03c5034ffc9e69a8a8e726c7d4a0696e48d0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2827,7 +2827,7 @@
 
        * lyxfunc.C: note status changed after a depth change
 
-2003-04-04  Angus Leeming  <angus@localhost.localdomain>
+2003-04-04  Angus Leeming  <leeming@lyx.org>
 
        * 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 67d370a9206b67e4416d250a82ecc55f36632fb6..f954b1302bd2e127041b719d2a489a1a02dc9f56 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-08  Angus Leeming  <leeming@lyx.org>
+
+       * 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  <leeming@lyx.org>
 
        * Alert_pimpl.C:

diff --git a/src/frontends/xforms/FormFiledialog.C b/src/frontends/xforms/FormFiledialog.C
index 325b03ab95e5add076a2d26d238c1bb81dbe4101..ad1093167a221916bda07ff2ab24981879e7e47f 100644 (file)
--- 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 f4bcfece0638c70cbad408203f2175b5ea3af63d..aa3c67c34c37ca9eb29f0c024e872d0fc9e26075 100644 (file)
--- 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  <angus@localhost.localdomain>
+2003-09-04  Angus Leeming  <leeming@lyx.org>
 
        * LoaderQueue.C (get):