BIND 10 master, updated. 6d9d7b76a3e55c6ca2a4c7af09674867a0e54c28 [master] fixed linker issue on SunStudio

BIND 10 source code commits bind10-changes at lists.isc.org
Mon Jan 31 22:45:07 UTC 2011


The branch, master has been updated
       via  6d9d7b76a3e55c6ca2a4c7af09674867a0e54c28 (commit)
      from  8909387beb99136bc5ec22574515c84e8ef526da (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6d9d7b76a3e55c6ca2a4c7af09674867a0e54c28
Author: Jelte Jansen <jelte at sol-10.lab.isc.org>
Date:   Mon Jan 31 22:40:48 2011 +0000

    [master] fixed linker issue on SunStudio
    
    Apparently SunStudio's name mangler cannot handle the use of the typedef in the anonymous namespace in asiolink.cc. For now I have removed the offending use of it (the other instances where it was used were ok), we probably want to move it to a header and use it consistently. Much thanks to jinmei for pointing out the problem :)

-----------------------------------------------------------------------

Summary of changes:
 src/lib/asiolink/asiolink.cc |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/asiolink/asiolink.cc b/src/lib/asiolink/asiolink.cc
index 10574a9..be86a5f 100644
--- a/src/lib/asiolink/asiolink.cc
+++ b/src/lib/asiolink/asiolink.cc
@@ -282,9 +282,13 @@ typedef std::vector<std::pair<std::string, uint16_t> > AddressVector;
 
 }
 
+// Here we do not use the typedef above, as the SunStudio compiler
+// mishandles this in its name mangling, and wouldn't compile.
+// We can probably use a typedef, but need to move it to a central
+// location and use it consistently.
 RecursiveQuery::RecursiveQuery(DNSService& dns_service,
-    const AddressVector& upstream,
-    const AddressVector& upstream_root,
+    const std::vector<std::pair<std::string, uint16_t> >& upstream,
+    const std::vector<std::pair<std::string, uint16_t> >& upstream_root,
     int query_timeout, int client_timeout, int lookup_timeout,
     unsigned retries) :
     dns_service_(dns_service), upstream_(new AddressVector(upstream)),




More information about the bind10-changes mailing list