#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed

1 files changed, 109 insertions, 109 deletions

diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h
index 80597fa186..eea5e39c61 100644
--- a/indra/llcommon/lluuid.h
+++ b/indra/llcommon/lluuid.h
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file lluuid.h
  *
  * $LicenseInfo:firstyear=2000&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -37,104 +37,104 @@ class LLMutex;
 
 const S32 UUID_BYTES = 16;
 const S32 UUID_WORDS = 4;
-const S32 UUID_STR_LENGTH = 37;	// actually wrong, should be 36 and use size below
+const S32 UUID_STR_LENGTH = 37; // actually wrong, should be 36 and use size below
 const S32 UUID_STR_SIZE = 37;
 const S32 UUID_BASE85_LENGTH = 21; // including the trailing NULL.
 
 struct uuid_time_t {
-	U32 high;
-	U32 low;
-		};
+    U32 high;
+    U32 low;
+        };
 
 class LL_COMMON_API LLUUID
 {
 public:
-	//
-	// CREATORS
-	//
-	LLUUID();
-	explicit LLUUID(const char *in_string); // Convert from string.
-	explicit LLUUID(const std::string& in_string); // Convert from string.
-	~LLUUID() = default;
-
-	//
-	// MANIPULATORS
-	//
-	void	generate();					// Generate a new UUID
-	void	generate(const std::string& stream); //Generate a new UUID based on hash of input stream
-
-	static LLUUID generateNewID(std::string stream = "");	//static version of above for use in initializer expressions such as constructor params, etc. 
-
-	BOOL	set(const char *in_string, BOOL emit = TRUE);	// Convert from string, if emit is FALSE, do not emit warnings
-	BOOL	set(const std::string& in_string, BOOL emit = TRUE);	// Convert from string, if emit is FALSE, do not emit warnings
-	void	setNull();					// Faster than setting to LLUUID::null.
+    //
+    // CREATORS
+    //
+    LLUUID();
+    explicit LLUUID(const char *in_string); // Convert from string.
+    explicit LLUUID(const std::string& in_string); // Convert from string.
+    ~LLUUID() = default;
+
+    //
+    // MANIPULATORS
+    //
+    void    generate();                 // Generate a new UUID
+    void    generate(const std::string& stream); //Generate a new UUID based on hash of input stream
+
+    static LLUUID generateNewID(std::string stream = "");   //static version of above for use in initializer expressions such as constructor params, etc.
+
+    BOOL    set(const char *in_string, BOOL emit = TRUE);   // Convert from string, if emit is FALSE, do not emit warnings
+    BOOL    set(const std::string& in_string, BOOL emit = TRUE);    // Convert from string, if emit is FALSE, do not emit warnings
+    void    setNull();                  // Faster than setting to LLUUID::null.
 
     S32     cmpTime(uuid_time_t *t1, uuid_time_t *t2);
-	static void    getSystemTime(uuid_time_t *timestamp);
-	void    getCurrentTime(uuid_time_t *timestamp);
-
-	//
-	// ACCESSORS
-	//
-	BOOL	isNull() const;			// Faster than comparing to LLUUID::null.
-	BOOL	notNull() const;		// Faster than comparing to LLUUID::null.
-	// JC: This is dangerous.  It allows UUIDs to be cast automatically
-	// to integers, among other things.  Use isNull() or notNull().
-	//		operator bool() const;
-
-	// JC: These must return real bool's (not BOOLs) or else use of the STL
-	// will generate bool-to-int performance warnings.
-	bool	operator==(const LLUUID &rhs) const;
-	bool	operator!=(const LLUUID &rhs) const;
-	bool	operator<(const LLUUID &rhs) const;
-	bool	operator>(const LLUUID &rhs) const;
-
-	// xor functions. Useful since any two random uuids xored together
-	// will yield a determinate third random unique id that can be
-	// used as a key in a single uuid that represents 2.
-	const LLUUID& operator^=(const LLUUID& rhs);
-	LLUUID operator^(const LLUUID& rhs) const;
-
-	// similar to functions above, but not invertible
-	// yields a third random UUID that can be reproduced from the two inputs
-	// but which, given the result and one of the inputs can't be used to
-	// deduce the other input
-	LLUUID combine(const LLUUID& other) const;
-	void combine(const LLUUID& other, LLUUID& result) const;  
-
-	friend LL_COMMON_API std::ostream&	 operator<<(std::ostream& s, const LLUUID &uuid);
-	friend LL_COMMON_API std::istream&	 operator>>(std::istream& s, LLUUID &uuid);
-
-	void toString(char *out) const;		// Does not allocate memory, needs 36 characters (including \0)
-	void toString(std::string& out) const;
-	void toCompressedString(char *out) const;	// Does not allocate memory, needs 17 characters (including \0)
-	void toCompressedString(std::string& out) const;
-
-	std::string asString() const;
-	std::string getString() const;
-
-	U16 getCRC16() const;
-	U32 getCRC32() const;
-
-	// Returns a 64 bits digest of the UUID, by XORing its two 64 bits long
-	// words. HB
-	inline U64 getDigest64() const
-	{
-		U64* tmp = (U64*)mData;
-		return tmp[0] ^ tmp[1];
-	}
-
-	static BOOL validate(const std::string& in_string); // Validate that the UUID string is legal.
-
-	static const LLUUID null;
-	static LLMutex * mMutex;
-
-	static U32 getRandomSeed();
-	static S32 getNodeID(unsigned char * node_id);
-
-	static BOOL parseUUID(const std::string& buf, LLUUID* value);
-
-	U8 mData[UUID_BYTES];
+    static void    getSystemTime(uuid_time_t *timestamp);
+    void    getCurrentTime(uuid_time_t *timestamp);
+
+    //
+    // ACCESSORS
+    //
+    BOOL    isNull() const;         // Faster than comparing to LLUUID::null.
+    BOOL    notNull() const;        // Faster than comparing to LLUUID::null.
+    // JC: This is dangerous.  It allows UUIDs to be cast automatically
+    // to integers, among other things.  Use isNull() or notNull().
+    //      operator bool() const;
+
+    // JC: These must return real bool's (not BOOLs) or else use of the STL
+    // will generate bool-to-int performance warnings.
+    bool    operator==(const LLUUID &rhs) const;
+    bool    operator!=(const LLUUID &rhs) const;
+    bool    operator<(const LLUUID &rhs) const;
+    bool    operator>(const LLUUID &rhs) const;
+
+    // xor functions. Useful since any two random uuids xored together
+    // will yield a determinate third random unique id that can be
+    // used as a key in a single uuid that represents 2.
+    const LLUUID& operator^=(const LLUUID& rhs);
+    LLUUID operator^(const LLUUID& rhs) const;
+
+    // similar to functions above, but not invertible
+    // yields a third random UUID that can be reproduced from the two inputs
+    // but which, given the result and one of the inputs can't be used to
+    // deduce the other input
+    LLUUID combine(const LLUUID& other) const;
+    void combine(const LLUUID& other, LLUUID& result) const;
+
+    friend LL_COMMON_API std::ostream&   operator<<(std::ostream& s, const LLUUID &uuid);
+    friend LL_COMMON_API std::istream&   operator>>(std::istream& s, LLUUID &uuid);
+
+    void toString(char *out) const;     // Does not allocate memory, needs 36 characters (including \0)
+    void toString(std::string& out) const;
+    void toCompressedString(char *out) const;   // Does not allocate memory, needs 17 characters (including \0)
+    void toCompressedString(std::string& out) const;
+
+    std::string asString() const;
+    std::string getString() const;
+
+    U16 getCRC16() const;
+    U32 getCRC32() const;
+
+    // Returns a 64 bits digest of the UUID, by XORing its two 64 bits long
+    // words. HB
+    inline U64 getDigest64() const
+    {
+        U64* tmp = (U64*)mData;
+        return tmp[0] ^ tmp[1];
+    }
+
+    static BOOL validate(const std::string& in_string); // Validate that the UUID string is legal.
+
+    static const LLUUID null;
+    static LLMutex * mMutex;
+
+    static U32 getRandomSeed();
+    static S32 getNodeID(unsigned char * node_id);
+
+    static BOOL parseUUID(const std::string& buf, LLUUID* value);
+
+    U8 mData[UUID_BYTES];
 };
 static_assert(std::is_trivially_copyable<LLUUID>::value, "LLUUID must be trivial copy");
 static_assert(std::is_trivially_move_assignable<LLUUID>::value, "LLUUID must be trivial move");
@@ -151,10 +151,10 @@ typedef std::set<LLUUID> uuid_set_t;
 // verify.)
 struct lluuid_less
 {
-	bool operator()(const LLUUID& lhs, const LLUUID& rhs) const
-	{
-		return (lhs < rhs) ? true : false;
-	}
+    bool operator()(const LLUUID& lhs, const LLUUID& rhs) const
+    {
+        return (lhs < rhs) ? true : false;
+    }
 };
 
 typedef std::set<LLUUID, lluuid_less> uuid_list_t;
@@ -167,28 +167,28 @@ typedef LLUUID LLAssetID;
 class LL_COMMON_API LLTransactionID : public LLUUID
 {
 public:
-	LLTransactionID() : LLUUID() { }
-	
-	static const LLTransactionID tnull;
-	LLAssetID makeAssetID(const LLUUID& session) const;
+    LLTransactionID() : LLUUID() { }
+
+    static const LLTransactionID tnull;
+    LLAssetID makeAssetID(const LLUUID& session) const;
 };
 
 // std::hash implementation for LLUUID
 namespace std
 {
-	template<> struct hash<LLUUID>
-	{
-		inline size_t operator()(const LLUUID& id) const noexcept
-		{
-			return (size_t)id.getDigest64();
-		}
-	};
+    template<> struct hash<LLUUID>
+    {
+        inline size_t operator()(const LLUUID& id) const noexcept
+        {
+            return (size_t)id.getDigest64();
+        }
+    };
 }
 
 // For use with boost containers.
 inline size_t hash_value(const LLUUID& id) noexcept
 {
-	return (size_t)id.getDigest64();
+    return (size_t)id.getDigest64();
 }
 
 #endif // LL_LLUUID_H