diff options
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | ace/Message_Queue.cpp | 4 | ||||
| -rw-r--r-- | ace/OS.cpp | 2 | ||||
| -rw-r--r-- | ace/Synch.cpp | 8 | ||||
| -rw-r--r-- | include/makeinclude/platform_irix6.x-32_sgic++.GNU | 2 | ||||
| -rw-r--r-- | include/makeinclude/platform_irix6.x-n32_sgic++.GNU | 2 | ||||
| -rw-r--r-- | tests/Mutex_Test.cpp | 1 | ||||
| -rw-r--r-- | tests/test_config.h | 2 |
8 files changed, 13 insertions, 10 deletions
@@ -1,4 +1,4 @@ -This is ACE version 4.2.36, released Wed Aug 13 02:28:17 1997. +This is ACE version 4.2.35, released Wed Aug 13 02:28:17 1997. If you have any problems with ACE, please send email to Douglas C. Schmidt (schmidt@cs.wustl.edu). diff --git a/ace/Message_Queue.cpp b/ace/Message_Queue.cpp index 2345904720c..e443ca814e8 100644 --- a/ace/Message_Queue.cpp +++ b/ace/Message_Queue.cpp @@ -505,6 +505,8 @@ ACE_Message_Queue<ACE_SYNCH_2>::wait_not_full_cond (ACE_Guard<ACE_SYNCH_MUTEX_T> mon.acquire (); } #else + ACE_UNUSED_ARG (mon); + // Wait while the queue is full. while (this->is_full_i ()) @@ -539,6 +541,8 @@ ACE_Message_Queue<ACE_SYNCH_2>::wait_not_empty_cond (ACE_Guard<ACE_SYNCH_MUTEX_T mon.acquire (); } #else + ACE_UNUSED_ARG (mon); + // Wait while the queue is empty. while (this->is_empty_i ()) diff --git a/ace/OS.cpp b/ace/OS.cpp index 1fab3f74937..02e0115bff9 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -215,7 +215,7 @@ ACE_OS::gethrtime (void) asm ("movl %eax, -4(%ebp)"); // least asm ("movl %edx, -8(%ebp)"); // most - return (u_long long) most << 32 | least; + return (ACE_hrtime_t) most << 32 | least; } #endif /* ACE_HAS_PENTIUM && __GNUC__ */ diff --git a/ace/Synch.cpp b/ace/Synch.cpp index b65d69a8a4d..8bab7ea5eba 100644 --- a/ace/Synch.cpp +++ b/ace/Synch.cpp @@ -936,14 +936,14 @@ ACE_Static_Object_Lock::instance (void) ACE_NEW_RETURN (ACE_Static_Object_Lock::mutex_, ACE_Recursive_Thread_Mutex, 0); #if ! defined (ACE_HAS_BROKEN_ATEXIT) - /* On DEC CXX, HP/UX, and AIX. - It should be done through the Object_Manager, but then - all "statics" will have to play that game as well. */ + // On DEC CXX, HP/UX, and AIX. It should be done through the + // Object_Manager, but then all "statics" will have to play that + // game as well. #if defined (ACE_HAS_SIG_C_FUNC) ::atexit (ace_static_object_lock_atexit); #else ::atexit (ACE_Static_Object_Lock::atexit); -#endif +#endif /* ACE_HAS_SIG_C_FUNC */ #endif /* ACE_HAS_BROKEN_ATEXIT */ } return ACE_Static_Object_Lock::mutex_; diff --git a/include/makeinclude/platform_irix6.x-32_sgic++.GNU b/include/makeinclude/platform_irix6.x-32_sgic++.GNU index ecc86e2b983..d0dbd161a36 100644 --- a/include/makeinclude/platform_irix6.x-32_sgic++.GNU +++ b/include/makeinclude/platform_irix6.x-32_sgic++.GNU @@ -33,7 +33,7 @@ CCFLAGS += +pp -woff 3203,3209,3161,3262,3665,3937,3259,3920 # Instantiate no templates automatically, do not run prelinker CCFLAGS += -ptnone -no_prelink LDFLAGS += -rpath "$(ACE_ROOT)/ace" -LDFLAGS += -Wl,-woff,15 -Wl,-woff,84 -Wl,-woff,85 +LDFLAGS += -Wl,-woff,15 -Wl,-woff,84 -Wl,-woff,85 -Wl,-woff,133 LIBS += -lpthread PIC = -KPIC AR = ar diff --git a/include/makeinclude/platform_irix6.x-n32_sgic++.GNU b/include/makeinclude/platform_irix6.x-n32_sgic++.GNU index ba827652045..40ee65d9fa2 100644 --- a/include/makeinclude/platform_irix6.x-n32_sgic++.GNU +++ b/include/makeinclude/platform_irix6.x-n32_sgic++.GNU @@ -25,7 +25,7 @@ CCFLAGS += -woff 1188,1682,1171,1681,1110 # Instantiate no templates automatically, do not run prelinker CCFLAGS += -ptnone -no_prelink LDFLAGS += -rpath "$(ACE_ROOT)/ace" -LDFLAGS += -Wl,-woff,15 -Wl,-woff,84 -Wl,-woff,85 +LDFLAGS += -Wl,-woff,15 -Wl,-woff,84 -Wl,-woff,85 -Wl,-woff,133 LIBS += -lpthread PIC = -KPIC AR = ar diff --git a/tests/Mutex_Test.cpp b/tests/Mutex_Test.cpp index 0c7880cbf83..3cb23cc978f 100644 --- a/tests/Mutex_Test.cpp +++ b/tests/Mutex_Test.cpp @@ -19,7 +19,6 @@ // ============================================================================ #include "ace/Service_Config.h" - #include "ace/Thread_Manager.h" #include "test_config.h" diff --git a/tests/test_config.h b/tests/test_config.h index 1834df3166a..a3ca2d9ab78 100644 --- a/tests/test_config.h +++ b/tests/test_config.h @@ -101,7 +101,7 @@ typedef size_t KEY; #define ACE_NEW_THREAD \ do {\ - ACE_LOG_MSG->msg_ostream (ace_file_stream.ourput_file ()) ;\ + ACE_LOG_MSG->msg_ostream (ace_file_stream.output_file ()) ;\ } while (0) #define ACE_APPEND_LOG(NAME) \ |