Parcourir la source

another fix to operator-> just like the one made in message.cc
added some comments on the intent


git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac251@2249 e5f2f494-b856-4b98-b285-d166d9295462

JINMEI Tatuya il y a 15 ans
Parent
commit
e01cb8ad5b
5 fichiers modifiés avec 10 ajouts et 8 suppressions
  1. 5 3
      configure.ac
  2. 1 1
      src/bin/auth/asio_link.cc
  3. 2 2
      src/bin/auth/asio_link.h
  4. 1 1
      src/lib/cc/session.cc
  5. 1 1
      src/lib/dns/rrsetlist.h

+ 5 - 3
configure.ac

@@ -18,9 +18,11 @@ AC_LANG_CPLUSPLUS
 
 # OS dependent compiler flags
 case "$host" in
-	*-solaris*)
-		CPPFLAGS="$CPPFLAGS -D_XPG4_2 -D__EXTENSIONS__"
-		;;
+*-solaris*)
+	# Solaris requires special definitions to get some standard libraries
+	# (e.g. getopt(3)) available with common used header files.
+	CPPFLAGS="$CPPFLAGS -D_XPG4_2 -D__EXTENSIONS__"
+	;;
 esac
 
 m4_define([_AM_PYTHON_INTERPRETER_LIST], [python python3 python3.1])

+ 1 - 1
src/bin/auth/asio_link.cc

@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include <unistd.h> 
+#include <unistd.h>             // for some IPC/network system calls
 #include <asio.hpp>
 #include <boost/bind.hpp>
 

+ 2 - 2
src/bin/auth/asio_link.h

@@ -24,8 +24,8 @@ struct IOServiceImpl;
 
 class IOService {
 public:
-    IOService(AuthSrv* auth_server, const char* const port, const bool use_ipv4,
-              const bool use_ipv6);
+    IOService(AuthSrv* auth_server, const char* const port,
+              const bool use_ipv4, const bool use_ipv6);
     ~IOService();
     void run();
     void stop();

+ 1 - 1
src/lib/cc/session.cc

@@ -25,7 +25,7 @@
 // A middle term solution is to generalize our local wrapper interface
 // (currently only available for the auth server), where all such portability
 // issues are hidden, and to have other modules use the wrapper.
-#include <unistd.h>
+#include <unistd.h>             // for some IPC/network system calls
 #include <asio.hpp>
 #include <asio/error_code.hpp>
 #include <asio/system_error.hpp>

+ 1 - 1
src/lib/dns/rrsetlist.h

@@ -60,7 +60,7 @@ public:
     }
     P operator->() const
     {
-        return (it_.operator->());
+        return (&(operator*()));
     }
     bool operator==(const RRsetListIterator& other)
     {