ChangeLogTag:Wed Aug 6 02:27:32 UTC 2003 Don Hinton <dhinton@dresystems.com>

4 files changed, 24 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index c53b06d6544..2eefb102afd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Wed Aug  6 02:27:32 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * include/makeinclude/platform_g++_common.GNU:
+          Modified the test for whether or not GNU ld supports the -E
+          option needed to enable dynamic_casting of objects passed to
+          shared libraries.  Thanks to Chris Cleeland
+          <cleeland@ociweb.com> for suggesting we dynamically obtain which
+          ld is in use by passing the -print-prog-name to gcc, and
+          Krishnakumar B <kitty@cse.wustl.edu> for the patch.
+
+        * ace/Null_Mutex.h:
+        * ace/Null_Semaphore.h:
+          Removed unused variable name to silence warnings.
+
 Tue Aug  5 17:25:35 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * ace/Dev_Poll_Reactor.{cpp,h}:
diff --git a/ace/Null_Mutex.h b/ace/Null_Mutex.h
index 603b42a9a7c..e58da18b276 100644
--- a/ace/Null_Mutex.h
+++ b/ace/Null_Mutex.h
@@ -46,10 +46,10 @@ public:
   int acquire (void) {return 0;}
 
   /// Return -1 with <errno> == <ETIME>.
-  int acquire (ACE_Time_Value &timeout) {errno = ETIME; return -1;}
+  int acquire (ACE_Time_Value &) {errno = ETIME; return -1;}
 
   /// Return -1 with <errno> == <ETIME>.
-  int acquire (ACE_Time_Value *timeout) {errno = ETIME; return -1;}
+  int acquire (ACE_Time_Value *) {errno = ETIME; return -1;}
 
   /// Return 0.
   int tryacquire (void) {return 0;}
diff --git a/ace/Null_Semaphore.h b/ace/Null_Semaphore.h
index fbd045f5455..ec7b14628e8 100644
--- a/ace/Null_Semaphore.h
+++ b/ace/Null_Semaphore.h
@@ -47,11 +47,11 @@ class ACE_Time_Value;
 class ACE_Export ACE_Null_Semaphore
 {
 public:
-  ACE_Null_Semaphore (unsigned int count = 1, // By default make this unlocked.
-                       int type = 0,
-                       const ACE_TCHAR *name = 0,
+  ACE_Null_Semaphore (unsigned int = 1,
+                       int = 0,
+                       const ACE_TCHAR * = 0,
                        void * = 0,
-                       int max = 0x7fffffff) {}
+                       int = 0x7fffffff) {}
   ~ACE_Null_Semaphore (void) {}
   /// Return 0.
   int remove (void) {return 0;}
diff --git a/include/makeinclude/platform_g++_common.GNU b/include/makeinclude/platform_g++_common.GNU
index 84bc99b7b0e..2cdabd47031 100644
--- a/include/makeinclude/platform_g++_common.GNU
+++ b/include/makeinclude/platform_g++_common.GNU
@@ -43,10 +43,6 @@ ifeq ($(templates),explicit)
   CPPFLAGS += -DACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 endif
 
-ifeq (,$(with_ld))
- with_ld = gnu
-endif
-
 # The correct flags to pass to the linker for ELF dynamic shared library
 # versioning
 #
@@ -62,13 +58,13 @@ ifneq ($(SONAME),)
   endif
 endif
 
-# Add all symbols to the dynamic symbol table.  Needed to enable dynamic_cast 
+# Add all symbols to the dynamic symbol table.  Needed to enable dynamic_cast
 # for shared libraries. (see http://gcc.gnu.org/faq.html#dso)
 ifeq ($(shared_libs), 1)
   ifneq ($(static_libs_only), 1)
-    ifeq ($(with_ld), gnu)
+    LD_EXPORT_DEFINED := $(shell `$(CXX_FOR_VERSION_TEST) -print-prog-name=ld` -E 2>&1 | grep 'option' /dev/null; echo $$?)
+    ifeq ($(LD_EXPORT_DEFINED),1)
       LDFLAGS += -Wl,-E
-    endif # macosx
+    endif # LD_EXPORT_DEFINED
   endif # static_libs_only
 endif # shared_libs
-