[Opde-commits] SF.net SVN: opde:[811] trunk/src/services/link/LinkCommon.h

[<vo...@us...>]

Revision: 811
          http://opde.svn.sourceforge.net/opde/?rev=811&view=rev
Author:   volca
Date:     2008-08-31 13:59:26 +0000 (Sun, 31 Aug 2008)

Log Message:
-----------
getting rid of DTypeDef for such a core struct - introducing LinkStruct for disk accesses

Modified Paths:
--------------
    trunk/src/services/link/LinkCommon.h

Modified: trunk/src/services/link/LinkCommon.h
===================================================================
--- trunk/src/services/link/LinkCommon.h	2008-08-31 13:57:12 UTC (rev 810)
+++ trunk/src/services/link/LinkCommon.h	2008-08-31 13:59:26 UTC (rev 811)
@@ -33,6 +33,13 @@
 	/// Link ID type. 32bit number at least...
 	typedef unsigned int link_id_t;
 
+	typedef struct LinkStruct { // sLink-like, but this one contains id as well
+		uint32_t id;
+		int32_t src;
+		int32_t dest;
+		uint16_t flavor;
+	};
+
 	/** A link container. Contains source, destination, ID, flavour and link data
 	*/
 	class Link {
@@ -51,6 +58,13 @@
 				mDst(dst),
 				mFlavor(flavor) {	};
 
+			Link(const LinkStruct& ls) :
+				mID(ls.id),
+				mSrc(ls.src),
+				mDst(ls.dest),
+				mFlavor(ls.flavor) {
+			}
+
 			/// Copy constructor
 			Link(Link& b) :
 				mID(b.mID),
@@ -65,6 +79,7 @@
 	};
 
 	/** Link data container. Holds link ID and it's data as a char array.
+	* @deprecated This construct should be removed the same way the property data struct will be. Any link access should be handled by a properly made DataStorage descendant
 	*/
 	class LinkData : public DType {
 		friend class Relation;
@@ -154,8 +169,7 @@
 		/// The link itself. Do not modify!
 		const LinkPtr link;
 	};
-
-
+	
 /// Creates a link ID from flavour, concreteness and index
 #define LINK_MAKE_ID(flavor, concrete, index) (flavor<<20 | concrete << 16 | index)
 /// Extracts Flavor ID from the link ID


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.