[Jahshaka-cvs] openlibraries/src/openassetlib/py guid.cpp, NONE, 1.1 asset.cpp, 1.20, 1.21 py.cpp, 1.2, 1.3 py.hpp, 1.2, 1.3 py.vcproj, 1.4, 1.5

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

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

Modified Files:
	asset.cpp py.cpp py.hpp py.vcproj 
Added Files:
	guid.cpp 
Log Message:
Add guid abstraction

Index: py.vcproj
===================================================================
RCS file: /cvsroot/openlibraries/openlibraries/src/openassetlib/py/py.vcproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- py.vcproj	10 Jul 2006 16:35:25 -0000	1.4
+++ py.vcproj	28 Sep 2006 11:08:16 -0000	1.5
@@ -134,6 +134,9 @@
 				RelativePath=".\asset.cpp">
 			</File>
 			<File
+				RelativePath=".\guid.cpp">
+			</File>
+			<File
 				RelativePath=".\openassetlib.cpp">
 			</File>
 			<File

Index: py.hpp
===================================================================
RCS file: /cvsroot/openlibraries/openlibraries/src/openassetlib/py/py.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- py.hpp	28 Jun 2006 10:47:47 -0000	1.2
+++ py.hpp	28 Sep 2006 11:08:16 -0000	1.3
@@ -10,6 +10,7 @@
 namespace olib { namespace openassetlib { namespace detail {
 
 void py_plugin();
+void py_guid();
 void py_asset();
 void py_set();
 void py_openassetlib();

--- NEW FILE: guid.cpp ---
// asset.cpp

// Copyright (C) 2005-2006 Visual Media FX Ltd.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.

#include <openassetlib/al/guid.hpp>
#include <openassetlib/py/python.hpp>
#include <openassetlib/py/py.hpp>

namespace al = olib::openassetlib::al;
namespace py = boost::python;

namespace olib { namespace openassetlib { namespace detail {

	namespace {
	
		al::guid_ptr create_guid()
		{
			return al::guid::create();
		}

		al::guid_ptr create_guid(const opl::string& guid_string)
		{
			return al::guid::create(guid_string);
		}

		al::guid_ptr create_guid(long long upper, long long lower)
		{
			return al::guid::create(upper, lower);
		}

		al::guid_ptr (*create_guid1)()									= &create_guid;
		al::guid_ptr (*create_guid2)(const opl::string& guid_string)	= &create_guid;
		al::guid_ptr (*create_guid3)(long long upper, long long lower)	= &create_guid;
	
	}

	void py_guid()
	{
		py::class_<al::guid, boost::noncopyable, al::guid_ptr>("guid", py::no_init)
			.def("upper", &al::guid::upper)
			.def("lower", &al::guid::lower)
			.def("string", &al::guid::string)
			.def("__eq__", &al::guid::operator==)
			.def("__ne__", &al::guid::operator!=)
			;

		py::def("create_guid", create_guid1);
		py::def("create_guid", create_guid2);
		py::def("create_guid", create_guid3);
	}

}}}

Index: py.cpp
===================================================================
RCS file: /cvsroot/openlibraries/openlibraries/src/openassetlib/py/py.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- py.cpp	28 Jun 2006 10:47:47 -0000	1.2
+++ py.cpp	28 Sep 2006 11:08:16 -0000	1.3
@@ -12,6 +12,7 @@
 BOOST_PYTHON_MODULE( openassetlib )
 {
 	oal::detail::py_plugin();
+	oal::detail::py_guid();
 	oal::detail::py_asset();
 	oal::detail::py_set();
 	oal::detail::py_openassetlib();

Index: asset.cpp
===================================================================
RCS file: /cvsroot/openlibraries/openlibraries/src/openassetlib/py/asset.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- asset.cpp	29 Aug 2006 17:13:48 -0000	1.20
+++ asset.cpp	28 Sep 2006 11:08:16 -0000	1.21
@@ -22,8 +22,8 @@
 		al::asset::const_iterator	(al::asset::*begin)() const	= &al::asset::begin;
 		al::asset::const_iterator	(al::asset::*end)() const	= &al::asset::end;
 
-		const opl::string	(al::asset::*get_guid)(void) const				= &al::asset::guid;
-		void				(al::asset::*set_guid)(const opl::string& guid)	= &al::asset::guid;
+		const al::guid_ptr	(al::asset::*get_guid)(void) const					= &al::asset::guid;
+		void				(al::asset::*set_guid)(const al::guid_ptr& guid)	= &al::asset::guid;
 
 		void (al::asset::*set_bool)		(const opl::string& key, const bool value)			= &al::asset::set;
 		void (al::asset::*set_long)		(const opl::string& key, const long value)			= &al::asset::set;