diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-08 17:42:30 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-08 17:42:30 +0000 |
| commit | c727db2cc01e5d56a0fde26618659d036d89e780 (patch) | |
| tree | b4c0418da58001c5869e92eeda93fbb4a0588403 | |
| parent | 2bd286136441d8851eb27e5583d50a30a46e708a (diff) | |
| download | ATCD-c727db2cc01e5d56a0fde26618659d036d89e780.tar.gz | |
ChangeLogTag:Sat Aug 8 09:37:27 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-98b | 11 | ||||
| -rw-r--r-- | ace/ACE.cpp | 2 | ||||
| -rw-r--r-- | ace/ACE.h | 2 | ||||
| -rw-r--r-- | ace/Synch.cpp | 18 |
4 files changed, 23 insertions, 10 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index edb18fad123..f42e2c93b2a 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -5,6 +5,17 @@ Sat Aug 8 09:37:27 1998 Carlos O'Ryan <coryan@cs.wustl.edu> definition of struct in_addr is not portable after all. Maybe there is a set of macros to make it portable? + * ace/ACE.h: + * ace/ACE.cpp: + Returning <const char* const> is unnecesary; and gives no more + guarantees that <const char*>, plus it gives warnings in + IRIX/MIPSPro compilers. + + * ace/Synch.cpp: + Removed explicit instantiations of ACE_Guard<ACE_Null_Mutex>, + the class is specialized so no instantiation is necessary. Same + thing for ACE_Write_Guard and ACE_Read_Guard. + Fri Aug 7 23:18:53 1998 Carlos O'Ryan <coryan@cs.wustl.edu> * ace/config-sunos5.5.h: diff --git a/ace/ACE.cpp b/ace/ACE.cpp index 24baa8ee82e..4dbd18aafcf 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -40,7 +40,7 @@ ACE::beta_version (void) return ACE_BETA_VERSION; } -const char* const +const char* ACE::compiler_name (void) { #ifdef ACE_CC_NAME diff --git a/ace/ACE.h b/ace/ACE.h index 014086529e5..027d504df27 100644 --- a/ace/ACE.h +++ b/ace/ACE.h @@ -47,7 +47,7 @@ public: // E.g., the "19" in ACE 4.3.19. Returns 0 for "stable" (non-beta) releases. // = C++ compiler version information. - static const char* const compiler_name (void); + static const char* compiler_name (void); // E.g., the "SunPro C++" in SunPro C++ 4.32.0 static u_int compiler_major_version (void); diff --git a/ace/Synch.cpp b/ace/Synch.cpp index 4ad3aa1bf3a..7a297349a32 100644 --- a/ace/Synch.cpp +++ b/ace/Synch.cpp @@ -942,18 +942,20 @@ template class ACE_Write_Guard<ACE_RW_Thread_Mutex>; #endif /* ACE_HAS_THREADS */ -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) // These are specialized both with and without ACE_HAS_THREADS. +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Guard<ACE_Process_Mutex>; -template class ACE_Guard<ACE_Null_Mutex>; -template class ACE_Read_Guard<ACE_Null_Mutex>; -template class ACE_Write_Guard<ACE_Null_Mutex>; + +// template class ACE_Guard<ACE_Null_Mutex>; +// template class ACE_Read_Guard<ACE_Null_Mutex>; +// template class ACE_Write_Guard<ACE_Null_Mutex>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -// These are specialized both with and without ACE_HAS_THREADS. #pragma instantiate ACE_Guard<ACE_Process_Mutex> -#pragma instantiate ACE_Guard<ACE_Null_Mutex> -#pragma instantiate ACE_Read_Guard<ACE_Null_Mutex> -#pragma instantiate ACE_Write_Guard<ACE_Null_Mutex> + +// #pragma instantiate ACE_Guard<ACE_Null_Mutex> +// #pragma instantiate ACE_Read_Guard<ACE_Null_Mutex> +// #pragma instantiate ACE_Write_Guard<ACE_Null_Mutex> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ #endif /* ACE_SYNCH_C */ |