[Boost-commit] svn:boost r54369 - in sandbox/monotonic/libs/object_model/src: . generic

Subject: [Boost-commit] svn:boost r54369 - in sandbox/monotonic/libs/object_model/src: . generic
From: christian.schladetsch_at_[hidden]
Date: 2009-06-26 03:03:35

Author: cschladetsch
Date: 2009-06-26 03:03:33 EDT (Fri, 26 Jun 2009)
New Revision: 54369
URL: http://svn.boost.org/trac/boost/changeset/54369

Log:
added system_traits<>

Text files modified: 
   sandbox/monotonic/libs/object_model/src/generic/class.cpp   |    18 -------------                           
   sandbox/monotonic/libs/object_model/src/generic/object.cpp  |    55 +++++++++++++++++++++------------------ 
   sandbox/monotonic/libs/object_model/src/label.cpp           |     8 -----                                   
   sandbox/monotonic/libs/object_model/src/object_model.vcproj |     8 +++++                                   
   4 files changed, 39 insertions(+), 50 deletions(-)

Modified: sandbox/monotonic/libs/object_model/src/generic/class.cpp
==============================================================================
--- sandbox/monotonic/libs/object_model/src/generic/class.cpp	(original)
+++ sandbox/monotonic/libs/object_model/src/generic/class.cpp	2009-06-26 03:03:33 EDT (Fri, 26 Jun 2009)
@@ -11,24 +11,6 @@
 
 BOOST_OM_BEGIN
 
-namespace generic
-{
-	klass::klass(const label &ident, type::number num)
-		: name(ident), type_number(num)
-	{
-	}
-
-	bool klass::has_method(label const &name) const
-	{
-		return methods.find(name) != methods.end();
-	}
-
-	bool klass::has_field(label const &name) const
-	{
-		return properties.find(name) != properties.end();
-	}
-
-}
 
 BOOST_OM_END
 

Modified: sandbox/monotonic/libs/object_model/src/generic/object.cpp
==============================================================================
--- sandbox/monotonic/libs/object_model/src/generic/object.cpp	(original)
+++ sandbox/monotonic/libs/object_model/src/generic/object.cpp	2009-06-26 03:03:33 EDT (Fri, 26 Jun 2009)
@@ -28,10 +28,10 @@
         {
         }
 
-	object_base::object_base(const const_storage& store)
-		: reg(store.reg), type(store.type), number(store.number)
-	{
-	}
+	//object_base::object_base(const const_storage& store)
+	//	: reg(store.reg), type(store.type), number(store.number)
+	//{
+	//}
 
 
         void object_base::construct(registry &r, klass const &k, handle h)
@@ -69,25 +69,25 @@
                 return get_registry().exists(number);
         }
 
-	const storage &object_base::get_storage() const
+	const object_base &object_base::get_storage() const
         {
                 return get_registry().get_storage(get_handle());
         }
 
-	storage &object_base::get_storage()
+	object_base &object_base::get_storage()
         {
                 return get_registry().get_storage(get_handle());
         }
 
-	void object_base::set(label const &name, object const &obj)
-	{
-		get_storage().set(name, obj);
-	}
+	//void object_base::set(label const &name, object const &obj)
+	//{
+	//	get_storage().set(name, obj);
+	//}
 
-	object object_base::get(label const &name) const
-	{
-		return get_storage().get(name);
-	}
+	//object object_base::get(label const &name) const
+	//{
+	//	return get_storage().get(name);
+	//}
 
         // const_object
 
@@ -105,15 +105,15 @@
 
         // mutable_object
 
-	mutable_object::mutable_object()
-	{
-	}
+	//mutable_object::mutable_object()
+	//{
+	//}
 
-	mutable_object::mutable_object(storage &store) : const_object(store)
-	{
-	}
+	//mutable_object::mutable_object(storage &store) : const_object(store)
+	//{
+	//}
 
-	storage &mutable_object::get_storage()
+	object_base &mutable_object::get_storage()
         {
                 return get_registry().get_storage(get_handle());
         }
@@ -123,10 +123,10 @@
         object::object() : konst(false) { }
 
         object::object(const const_object& obj) : const_object(obj), konst(true) { }
-	object::object(const const_storage & obj) : const_object(obj), konst(true) { }
+	//object::object(const const_storage & obj) : const_object(obj), konst(true) { }
 
         object::object(const mutable_object& obj) : const_object(obj), konst(false) { }
-	object::object(const storage &store) : const_object(store), konst(false) { }
+	//object::object(const storage &store) : const_object(store), konst(false) { }
 
         object &object::operator=(const const_object& obj)
         {
@@ -141,13 +141,18 @@
                 konst = false;
                 return *this;
         }
-	storage &object::get_storage()
+	object_base &object::get_storage()
+	{
+		if (is_const())
+			throw const_error();
+		return get_registry().get_storage(get_handle());
+	}
+	const object_base &object::get_storage() const
         {
                 if (is_const())
                         throw const_error();
                 return get_registry().get_storage(get_handle());
         }
-
 }
 
 const generic::object null_object;

Modified: sandbox/monotonic/libs/object_model/src/label.cpp
==============================================================================
--- sandbox/monotonic/libs/object_model/src/label.cpp	(original)
+++ sandbox/monotonic/libs/object_model/src/label.cpp	2009-06-26 03:03:33 EDT (Fri, 26 Jun 2009)
@@ -10,13 +10,7 @@
 
 BOOST_OM_BEGIN
 
-label::label(const char_type *text)
-{
-}
-
-label::label(const string_type &text)
-{
-}
+
 
 
 

Modified: sandbox/monotonic/libs/object_model/src/object_model.vcproj
==============================================================================
--- sandbox/monotonic/libs/object_model/src/object_model.vcproj	(original)
+++ sandbox/monotonic/libs/object_model/src/object_model.vcproj	2009-06-26 03:03:33 EDT (Fri, 26 Jun 2009)
@@ -298,6 +298,14 @@
 					>
                                 </File>
                                 <File
+					RelativePath="..\..\..\boost\object_model\string_stream.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\boost\object_model\system_traits.hpp"
+					>
+				</File>
+				<File
                                         RelativePath="..\..\..\boost\object_model\template_header.hpp"
 					>
                                 </File>