[Jahshaka-cvs] openlibraries/src/openassetlib/al al.hpp, 1.28, 1.29 asset.cpp, 1.12, 1.13 set.cpp, 1.13, 1.14 set.hpp, 1.9, 1.10

[jpn <non...@us...>]

Update of /cvsroot/openlibraries/openlibraries/src/openassetlib/al
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27160/src/openassetlib/al

Modified Files:
	al.hpp asset.cpp set.cpp set.hpp 
Log Message:
extra tests added + bit of tidying

Index: asset.cpp
===================================================================
RCS file: /cvsroot/openlibraries/openlibraries/src/openassetlib/al/asset.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- asset.cpp	16 Oct 2006 11:39:33 -0000	1.12
+++ asset.cpp	19 Oct 2006 17:52:26 -0000	1.13
@@ -136,12 +136,12 @@
 
 	void asset::set(const key_type& key, const unsigned char value)
 	{
-		set(key, boost::lexical_cast<opl::string, const unsigned char>(value));
+		set(key, boost::lexical_cast<opl::string>(static_cast<unsigned short>(value)));
 	}
 
 	void asset::set(const key_type& key, const char value)
 	{
-		set(key, boost::lexical_cast<opl::string>(value));
+		set(key, boost::lexical_cast<opl::string>(static_cast<short>(value)));
 	}
 
 	void asset::set(const key_type& key, const unsigned short value)

Index: set.hpp
===================================================================
RCS file: /cvsroot/openlibraries/openlibraries/src/openassetlib/al/set.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- set.hpp	6 Oct 2006 11:17:25 -0000	1.9
+++ set.hpp	19 Oct 2006 17:52:26 -0000	1.10
@@ -72,8 +72,6 @@
 	void							reserve(size_type count);
 	size_type						size() const;
 	void							swap(set& right);
-	const_reference					operator[](size_type pos) const;
-	reference						operator[](size_type pos);
 
 	// additional helper functions to be exported to python interface
 	void remove(const asset_ptr& asset);

Index: set.cpp
===================================================================
RCS file: /cvsroot/openlibraries/openlibraries/src/openassetlib/al/set.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- set.cpp	16 Oct 2006 11:39:33 -0000	1.13
+++ set.cpp	19 Oct 2006 17:52:26 -0000	1.14
@@ -225,16 +225,6 @@
 	vec_.swap(right.vec_);
 }
 
-set::const_reference set::operator[](size_type pos) const
-{
-	return vec_.operator[](pos);
-}
-
-set::reference set::operator[](size_type pos)
-{
-	return vec_.operator[](pos);
-}
-
 void set::remove(const asset_ptr& asset)
 {
 	if(asset == asset_ptr())

Index: al.hpp
===================================================================
RCS file: /cvsroot/openlibraries/openlibraries/src/openassetlib/al/al.hpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- al.hpp	16 Oct 2006 11:39:33 -0000	1.28
+++ al.hpp	19 Oct 2006 17:52:26 -0000	1.29
@@ -60,6 +60,7 @@
 		// Set searches
 		struct AL_DECLSPEC predicate : public std::unary_function<al::asset_ptr, bool>
 		{
+			virtual ~predicate() {};
 			virtual bool operator()(const al::asset_ptr& asset) const = 0;
 		};
 
@@ -74,7 +75,6 @@
 		private:
 			key_value_regex_search_predicate& operator=( const key_value_regex_search_predicate& );
 
-		private:
 			const opl::string	key_regex_;
 			const opl::string	value_regex_;
 		};
@@ -90,7 +90,6 @@
 		private:
 			location_filename_regex_predicate& operator=( const location_filename_regex_predicate& );
 
-		private:
 			const opl::string location_regex_;
 			const opl::string filename_regex_;
 		};
@@ -99,10 +98,10 @@
 
 		/////////////////////////////////////////////////////
 		// Helper functions to convert assets to olib objects
-		AL_DECLSPEC bool is_convertible(asset_ptr asset);
+		AL_DECLSPEC bool                    is_convertible(asset_ptr asset);
 		AL_DECLSPEC oil::il::image_type_ptr convert_to_image(asset_ptr);
 		AL_DECLSPEC oml::ml::input_type_ptr convert_to_media(asset_ptr);
-		AL_DECLSPEC ool::sg::scene_ptr convert_to_object(asset_ptr);
+		AL_DECLSPEC ool::sg::scene_ptr      convert_to_object(asset_ptr);
 
 		/////////////////////////////////////////////////////////////////////////////
 		// Helper functions to serialize/deserialize image_type data to/from metadata