From 1c96de0be82054ec6361277234e40c931787a618 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Wed, 12 May 2010 16:15:48 +0200
Subject: [PATCH] Fixed: #890 Ryzom Client Build Fix - _Bool is a keyword in
 C99 (patch provided by rti)

---
 code/ryzom/client/src/interface_v3/interface_options.cpp | 2 +-
 code/ryzom/client/src/interface_v3/interface_options.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/ryzom/client/src/interface_v3/interface_options.cpp b/code/ryzom/client/src/interface_v3/interface_options.cpp
index 961b84055..ae70f1460 100644
--- a/code/ryzom/client/src/interface_v3/interface_options.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_options.cpp
@@ -48,7 +48,7 @@ void		CInterfaceOptionValue::init(const std::string &str)
 	fromString(str, _Int);
 	fromString(str, _Float);
 	_Color= CInterfaceElement::convertColor (str.c_str());
-	_Bool= CInterfaceElement::convertBool(str.c_str());
+	_Boolean= CInterfaceElement::convertBool(str.c_str());
 }
 
 
diff --git a/code/ryzom/client/src/interface_v3/interface_options.h b/code/ryzom/client/src/interface_v3/interface_options.h
index 01aafc6c6..3fdb82a97 100644
--- a/code/ryzom/client/src/interface_v3/interface_options.h
+++ b/code/ryzom/client/src/interface_v3/interface_options.h
@@ -37,14 +37,14 @@ public:
 		_Color= NLMISC::CRGBA::White;
 		_Int= 0;
 		_Float= 0;
-		_Bool= false;
+		_Boolean= false;
 	}
 
 	const std::string		&getValStr	() const {return _Str;}
 	sint32					getValSInt32() const {return _Int;}
 	float					getValFloat	() const {return _Float;}
 	NLMISC::CRGBA			getValColor	() const {return _Color;}
-	bool					getValBool	() const {return _Bool;}
+	bool					getValBool	() const {return _Boolean;}
 
 	void					init(const std::string &str);
 
@@ -57,7 +57,7 @@ private:
 	NLMISC::CRGBA	_Color;
 	sint32			_Int;
 	float			_Float;
-	bool			_Bool;
+	bool			_Boolean;
 };