*Merge.

--HG--
branch : trunk

1 files changed, 99 insertions, 99 deletions

diff --git a/dep/include/sockets/Utility.h b/dep/include/sockets/Utility.h
index 0fbccd3dfa3..f940221e5ca 100644
--- a/dep/include/sockets/Utility.h
+++ b/dep/include/sockets/Utility.h
@@ -1,6 +1,6 @@
 /** \file Utility.h
- **	\date  2004-02-13
- **	\author grymse@alhem.net
+ ** \date  2004-02-13
+ ** \author grymse@alhem.net
 **/
 /*
 Copyright (C) 2004-2007  Anders Hedstrom
@@ -8,7 +8,7 @@ Copyright (C) 2004-2007  Anders Hedstrom
 This library is made available under the terms of the GNU GPL.
 
 If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
+a separate license agreement is available. For information about
 the closed-source license agreement for the C++ sockets library,
 please visit http://www.alhem.net/Sockets/license.html and/or
 email license@alhem.net.
@@ -46,135 +46,135 @@ namespace SOCKETS_NAMESPACE {
 
 class SocketAddress;
 
-/** Conversion utilities. 
-	\ingroup util */
+/** Conversion utilities.
+    \ingroup util */
 class Utility
 {
-	/**
-		The Mersenne Twister
-		http://www.math.keio.ac.jp/~matumoto/emt.html
-	*/
-	class Rng {
-	public:
-		Rng(unsigned long seed);
-
-		unsigned long Get();
-
-	private:
-		int m_value;
-		unsigned long m_tmp[TWIST_LEN];
-	};
-	class ncmap_compare {
-	public:
-		bool operator()(const std::string& x, const std::string& y) const {
-			return strcasecmp(x.c_str(), y.c_str()) < 0;
-		}
-	};
+    /**
+        The Mersenne Twister
+        http://www.math.keio.ac.jp/~matumoto/emt.html
+    */
+    class Rng {
+    public:
+        Rng(unsigned long seed);
+
+        unsigned long Get();
+
+    private:
+        int m_value;
+        unsigned long m_tmp[TWIST_LEN];
+    };
+    class ncmap_compare {
+    public:
+        bool operator()(const std::string& x, const std::string& y) const {
+            return strcasecmp(x.c_str(), y.c_str()) < 0;
+        }
+    };
 public:
-	template<typename Y> class ncmap : public std::map<std::string, Y, ncmap_compare> {
-	public:
-		ncmap() {}
-	};
+    template<typename Y> class ncmap : public std::map<std::string, Y, ncmap_compare> {
+    public:
+        ncmap() {}
+    };
 public:
-	static std::string base64(const std::string& str_in);
-	static std::string base64d(const std::string& str_in);
-	static std::string l2string(long l);
-	static std::string bigint2string(uint64_t l);
-	static uint64_t atoi64(const std::string& str);
-	static unsigned int hex2unsigned(const std::string& str);
-	static std::string rfc1738_encode(const std::string& src);
-	static std::string rfc1738_decode(const std::string& src);
-
-	/** Checks whether a string is a valid ipv4/ipv6 ip number. */
-	static bool isipv4(const std::string&);
-	/** Checks whether a string is a valid ipv4/ipv6 ip number. */
-	static bool isipv6(const std::string&);
-
-	/** Hostname to ip resolution ipv4, not asynchronous. */
-	static bool u2ip(const std::string&, ipaddr_t&);
-	static bool u2ip(const std::string&, struct sockaddr_in& sa, int ai_flags = 0);
+    static std::string base64(const std::string& str_in);
+    static std::string base64d(const std::string& str_in);
+    static std::string l2string(long l);
+    static std::string bigint2string(uint64_t l);
+    static uint64_t atoi64(const std::string& str);
+    static unsigned int hex2unsigned(const std::string& str);
+    static std::string rfc1738_encode(const std::string& src);
+    static std::string rfc1738_decode(const std::string& src);
+
+    /** Checks whether a string is a valid ipv4/ipv6 ip number. */
+    static bool isipv4(const std::string&);
+    /** Checks whether a string is a valid ipv4/ipv6 ip number. */
+    static bool isipv6(const std::string&);
+
+    /** Hostname to ip resolution ipv4, not asynchronous. */
+    static bool u2ip(const std::string&, ipaddr_t&);
+    static bool u2ip(const std::string&, struct sockaddr_in& sa, int ai_flags = 0);
 
 #ifdef ENABLE_IPV6
 #ifdef IPPROTO_IPV6
-	/** Hostname to ip resolution ipv6, not asynchronous. */
-	static bool u2ip(const std::string&, struct in6_addr&);
-	static bool u2ip(const std::string&, struct sockaddr_in6& sa, int ai_flags = 0);
+    /** Hostname to ip resolution ipv6, not asynchronous. */
+    static bool u2ip(const std::string&, struct in6_addr&);
+    static bool u2ip(const std::string&, struct sockaddr_in6& sa, int ai_flags = 0);
 #endif
 #endif
 
-	/** Reverse lookup of address to hostname */
-	static bool reverse(struct sockaddr *sa, socklen_t sa_len, std::string&, int flags = 0);
-	static bool reverse(struct sockaddr *sa, socklen_t sa_len, std::string& hostname, std::string& service, int flags = 0);
+    /** Reverse lookup of address to hostname */
+    static bool reverse(struct sockaddr *sa, socklen_t sa_len, std::string&, int flags = 0);
+    static bool reverse(struct sockaddr *sa, socklen_t sa_len, std::string& hostname, std::string& service, int flags = 0);
 
-	static bool u2service(const std::string& name, int& service, int ai_flags = 0);
+    static bool u2service(const std::string& name, int& service, int ai_flags = 0);
 
-	/** Convert binary ip address to string: ipv4. */
-	static void l2ip(const ipaddr_t,std::string& );
-	static void l2ip(const in_addr&,std::string& );
+    /** Convert binary ip address to string: ipv4. */
+    static void l2ip(const ipaddr_t,std::string& );
+    static void l2ip(const in_addr&,std::string& );
 #ifdef ENABLE_IPV6
 #ifdef IPPROTO_IPV6
-	/** Convert binary ip address to string: ipv6. */
-	static void l2ip(const struct in6_addr&,std::string& ,bool mixed = false);
+    /** Convert binary ip address to string: ipv6. */
+    static void l2ip(const struct in6_addr&,std::string& ,bool mixed = false);
 
-	/** ipv6 address compare. */
-	static int in6_addr_compare(in6_addr,in6_addr);
+    /** ipv6 address compare. */
+    static int in6_addr_compare(in6_addr,in6_addr);
 #endif
 #endif
-	/** ResolveLocal (hostname) - call once before calling any GetLocal method. */
-	static void ResolveLocal();
-	/** Returns local hostname, ResolveLocal must be called once before using.
-		\sa ResolveLocal */
-	static const std::string& GetLocalHostname();
-	/** Returns local ip, ResolveLocal must be called once before using.
-		\sa ResolveLocal */
-	static ipaddr_t GetLocalIP();
-	/** Returns local ip number as string.
-		\sa ResolveLocal */
-	static const std::string& GetLocalAddress();
+    /** ResolveLocal (hostname) - call once before calling any GetLocal method. */
+    static void ResolveLocal();
+    /** Returns local hostname, ResolveLocal must be called once before using.
+        \sa ResolveLocal */
+    static const std::string& GetLocalHostname();
+    /** Returns local ip, ResolveLocal must be called once before using.
+        \sa ResolveLocal */
+    static ipaddr_t GetLocalIP();
+    /** Returns local ip number as string.
+        \sa ResolveLocal */
+    static const std::string& GetLocalAddress();
 #ifdef ENABLE_IPV6
 #ifdef IPPROTO_IPV6
-	/** Returns local ipv6 ip.
-		\sa ResolveLocal */
-	static const struct in6_addr& GetLocalIP6();
-	/** Returns local ipv6 address.
-		\sa ResolveLocal */
-	static const std::string& GetLocalAddress6();
+    /** Returns local ipv6 ip.
+        \sa ResolveLocal */
+    static const struct in6_addr& GetLocalIP6();
+    /** Returns local ipv6 address.
+        \sa ResolveLocal */
+    static const std::string& GetLocalAddress6();
 #endif
 #endif
-	/** Set environment variable.
-		\param var Name of variable to set
-		\param value Value */
-	static void SetEnv(const std::string& var,const std::string& value);
-	/** Convert sockaddr struct to human readable string.
-		\param sa Ptr to sockaddr struct */
-	static std::string Sa2String(struct sockaddr *sa);
+    /** Set environment variable.
+        \param var Name of variable to set
+        \param value Value */
+    static void SetEnv(const std::string& var,const std::string& value);
+    /** Convert sockaddr struct to human readable string.
+        \param sa Ptr to sockaddr struct */
+    static std::string Sa2String(struct sockaddr *sa);
 
-	/** Get current time in sec/microseconds. */
-	static void GetTime(struct timeval *);
+    /** Get current time in sec/microseconds. */
+    static void GetTime(struct timeval *);
 
-	static std::auto_ptr<SocketAddress> CreateAddress(struct sockaddr *,socklen_t);
+    static std::auto_ptr<SocketAddress> CreateAddress(struct sockaddr *,socklen_t);
 
-	static unsigned long ThreadID();
+    static unsigned long ThreadID();
 
-	static std::string ToLower(const std::string& str);
-	static std::string ToUpper(const std::string& str);
+    static std::string ToLower(const std::string& str);
+    static std::string ToUpper(const std::string& str);
 
-	static std::string ToString(double d);
+    static std::string ToString(double d);
 
-	/** Returns a random 32-bit integer */
-	static unsigned long Rnd();
+    /** Returns a random 32-bit integer */
+    static unsigned long Rnd();
 
 private:
-	static std::string m_host; ///< local hostname
-	static ipaddr_t m_ip; ///< local ip address
-	static std::string m_addr; ///< local ip address in string format
+    static std::string m_host; ///< local hostname
+    static ipaddr_t m_ip; ///< local ip address
+    static std::string m_addr; ///< local ip address in string format
 #ifdef ENABLE_IPV6
 #ifdef IPPROTO_IPV6
-	static struct in6_addr m_local_ip6; ///< local ipv6 address
+    static struct in6_addr m_local_ip6; ///< local ipv6 address
 #endif
-	static std::string m_local_addr6; ///< local ipv6 address in string format
+    static std::string m_local_addr6; ///< local ipv6 address in string format
 #endif
-	static bool m_local_resolved; ///< ResolveLocal has been called if true
+    static bool m_local_resolved; ///< ResolveLocal has been called if true
 };