This is the mail archive of the gdb-cvs@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] Avoid "enum conversion when passing argument 1 of 'getrusage' is invalid in C++" warning


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=aaae08a7e4ac526975403ebb5f93b7f24ea16b90

commit aaae08a7e4ac526975403ebb5f93b7f24ea16b90
Author: Uros Bizjak <ubizjak@gmail.com>
Date:   Sat Nov 28 16:39:29 2015 +0000

    Avoid "enum conversion when passing argument 1 of 'getrusage' is invalid in C++" warning
    
     	* getruntime.c (get_run_time) [__USE_GNU]: Use RUSAGE_SELF as
     	argument 1 of getrusage call.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@225534 138bc75d-0d04-0410-961f-82ee72b054a4

Diff:
---
 libiberty/ChangeLog    | 5 +++++
 libiberty/getruntime.c | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 3b360a5..1341206 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -52,6 +52,11 @@
 
 	* configure: Regenerated.
 
+2015-07-08  Uros Bizjak  <ubizjak@gmail.com>
+
+	* getruntime.c (get_run_time) [__USE_GNU]: Use RUSAGE_SELF as
+	argument 1 of getrusage call.
+
 2015-06-01  Jason Merrill  <jason@redhat.com>
 
 	* cp-demangle.c (cplus_demangle_type): Handle arguments to vendor
diff --git a/libiberty/getruntime.c b/libiberty/getruntime.c
index 82f3d2e..9d5eed1 100644
--- a/libiberty/getruntime.c
+++ b/libiberty/getruntime.c
@@ -95,7 +95,11 @@ get_run_time (void)
 #if defined (HAVE_GETRUSAGE) && defined (HAVE_SYS_RESOURCE_H)
   struct rusage rusage;
 
+#if defined __USE_GNU && !defined __cplusplus
+  getrusage (RUSAGE_SELF, &rusage);
+#else
   getrusage (0, &rusage);
+#endif
   return (rusage.ru_utime.tv_sec * 1000000 + rusage.ru_utime.tv_usec
 	  + rusage.ru_stime.tv_sec * 1000000 + rusage.ru_stime.tv_usec);
 #else /* ! HAVE_GETRUSAGE */


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]