diff mbox

Fixed some compilation warnings

Message ID 4E28DE4B.1070807@gmail.com
State New
Headers show

Commit Message

Diogo Sousa July 22, 2011, 2:19 a.m. UTC 
Hi,

This patch fixes 3 compiling warnings. One of them was actually a wrong
assert (operator precedence mistake).

Diogo Sousa

2011-07-22  Diogo Sousa  <diogogsousa@gmail.com>

	* natObject.cc: Fixed an expression inside an assert (it
	always yield true). This was also a compiler warning.
	* libcaf.h: Added prototypes of functions
        _gfortran_caf_critical() and _gfortran_caf_end_critical to
	prevent compiler warnings.
diff mbox

Patch

Index: libjava/java/lang/natObject.cc
===================================================================
--- libjava/java/lang/natObject.cc      (revision 176583)
+++ libjava/java/lang/natObject.cc      (working copy)
@@ -929,7 +929,7 @@  retry:
          // only be held by other threads waiting for conversion, and
          // they, like us, drop it quickly without blocking.
          _Jv_MutexLock(&(hl->si.mutex));
-         JvAssert(he -> address == address | LOCKED );
+         JvAssert(he -> address == (address | LOCKED));
          release_set(&(he -> address), (address | REQUEST_CONVERSION |
HEAVY));
                                // release lock on he
          LOG(REQ_CONV, (address | REQUEST_CONVERSION | HEAVY), self);
Index: libgfortran/caf/libcaf.h
===================================================================
--- libgfortran/caf/libcaf.h    (revision 176583)
+++ libgfortran/caf/libcaf.h    (working copy)
@@ -77,6 +77,9 @@  void _gfortran_caf_sync_images (int, int

 /* FIXME: The CRITICAL functions should be removed;
    the functionality is better represented using Coarray's lock
feature.  */
+void _gfortran_caf_critical (void);
+void _gfortran_caf_end_critical (void);
+
 void _gfortran_caf_critical (void)  { }
 void _gfortran_caf_end_critical (void)  { }