@@ -57,7 +57,7 @@ class Object;
 class JSON_API Array
 {
 public:
-	typedef std::vector<Dynamic::Var> ValueVector;
+	typedef std::vector<Dynamic::Var> ValueVec;
 	typedef SharedPtr<Array> Ptr;
 
 	Array();
@@ -69,10 +69,10 @@ class JSON_API Array
 	virtual ~Array();
 		/// Destructor
 
-	ValueVector::const_iterator begin() const;
+	ValueVec::const_iterator begin() const;
 		/// Returns iterator
 
-	ValueVector::const_iterator end() const;
+	ValueVec::const_iterator end() const;
 		/// Returns iterator
 
 	Dynamic::Var get(unsigned int index) const;
@@ -148,26 +148,26 @@ class JSON_API Array
 		/// Removes the element on the given index.
 
 private:
-	ValueVector _values;
+	ValueVec _values;
 };
 
 
-inline Array::ValueVector::const_iterator Array::begin() const
+inline Array::ValueVec::const_iterator Array::begin() const
 {
 	return _values.begin();
 }
 
 
-inline Array::ValueVector::const_iterator Array::end() const
+inline Array::ValueVec::const_iterator Array::end() const
 
 {
 	return _values.end();
 }
 
 
-inline unsigned int Array::size() const
+inline std::size_t Array::size() const
 {
-	return _values.size();
+	return static_cast<std::size_t>(_values.size());
 }
 
 
 
@@ -186,9 +186,9 @@ inline void Object::set(const std::string& key, const Dynamic::Var& value)
 }
 
 
-inline unsigned int Object::size() const
+inline std::size_t Object::size() const
 {
-	return _values.size();
+	return static_cast<std::size_t>(_values.size());
 }
 
 
 
@@ -115,7 +115,7 @@ void Array::stringify(std::ostream& out, unsigned int indent) const
 	if ( indent > 0 )
 		out << std::endl;
 
-	for(ValueVector::const_iterator it = _values.begin(); it != _values.end();)
+	for(ValueVec::const_iterator it = _values.begin(); it != _values.end();)
 	{
 		for(int i = 0; i < indent; i++)
 		{
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class Object;`
`57`	`57`	`class JSON_API Array`
`58`	`58`	`{`
`59`	`59`	`public:`
`60`		`- typedef std::vector<Dynamic::Var> ValueVector;`
	`60`	`+ typedef std::vector<Dynamic::Var> ValueVec;`
`61`	`61`	`typedef SharedPtr<Array> Ptr;`
`62`	`62`
`63`	`63`	`Array();`
`@@ -69,10 +69,10 @@ class JSON_API Array`
`69`	`69`	`virtual ~Array();`
`70`	`70`	`/// Destructor`
`71`	`71`
`72`		`- ValueVector::const_iterator begin() const;`
	`72`	`+ ValueVec::const_iterator begin() const;`
`73`	`73`	`/// Returns iterator`
`74`	`74`
`75`		`- ValueVector::const_iterator end() const;`
	`75`	`+ ValueVec::const_iterator end() const;`
`76`	`76`	`/// Returns iterator`
`77`	`77`
`78`	`78`	`Dynamic::Var get(unsigned int index) const;`
`@@ -148,26 +148,26 @@ class JSON_API Array`
`148`	`148`	`/// Removes the element on the given index.`
`149`	`149`
`150`	`150`	`private:`
`151`		`- ValueVector _values;`
	`151`	`+ ValueVec _values;`
`152`	`152`	`};`
`153`	`153`
`154`	`154`
`155`		`-inline Array::ValueVector::const_iterator Array::begin() const`
	`155`	`+inline Array::ValueVec::const_iterator Array::begin() const`
`156`	`156`	`{`
`157`	`157`	`return _values.begin();`
`158`	`158`	`}`
`159`	`159`
`160`	`160`
`161`		`-inline Array::ValueVector::const_iterator Array::end() const`
	`161`	`+inline Array::ValueVec::const_iterator Array::end() const`
`162`	`162`
`163`	`163`	`{`
`164`	`164`	`return _values.end();`
`165`	`165`	`}`
`166`	`166`
`167`	`167`
`168`		`-inline unsigned int Array::size() const`
	`168`	`+inline std::size_t Array::size() const`
`169`	`169`	`{`
`170`		`- return _values.size();`
	`170`	`+ return static_cast<std::size_t>(_values.size());`
`171`	`171`	`}`
`172`	`172`
`173`	`173`
Original file line number	Diff line number	Diff line change
`@@ -186,9 +186,9 @@ inline void Object::set(const std::string& key, const Dynamic::Var& value)`
`186`	`186`	`}`
`187`	`187`
`188`	`188`
`189`		`-inline unsigned int Object::size() const`
	`189`	`+inline std::size_t Object::size() const`
`190`	`190`	`{`
`191`		`- return _values.size();`
	`191`	`+ return static_cast<std::size_t>(_values.size());`
`192`	`192`	`}`
`193`	`193`
`194`	`194`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ void Array::stringify(std::ostream& out, unsigned int indent) const`
`115`	`115`	`if ( indent > 0 )`
`116`	`116`	`out << std::endl;`
`117`	`117`
`118`		`- for(ValueVector::const_iterator it = _values.begin(); it != _values.end();)`
	`118`	`+ for(ValueVec::const_iterator it = _values.begin(); it != _values.end();)`
`119`	`119`	`{`
`120`	`120`	`for(int i = 0; i < indent; i++)`
`121`	`121`	`{`