Menu
▾
▴
[Stdair-svn] SF.net SVN: stdair:[330] trunk/stdair/test/archi_intru
|
From: <den...@us...> - 2010-09-13 06:49:12
|
Revision: 330
http://stdair.svn.sourceforge.net/stdair/?rev=330&view=rev
Author: denis_arnaud
Date: 2010-09-13 06:49:06 +0000 (Mon, 13 Sep 2010)
Log Message:
-----------
[Test] Added a test sub-directory for Boost.Intrusive-based architecture (there is still some work to do).
Modified Paths:
--------------
trunk/stdair/test/archi_intru/BomRoot.hpp
trunk/stdair/test/archi_intru/FacRelationShipRoot.hpp
trunk/stdair/test/archi_intru/FlightDate.hpp
trunk/stdair/test/archi_intru/RelationShipHolder.hpp
trunk/stdair/test/archi_intru/RelationShipHolderAbstract.hpp
trunk/stdair/test/archi_intru/RelationShipHolderSet.hpp
Modified: trunk/stdair/test/archi_intru/BomRoot.hpp
===================================================================
--- trunk/stdair/test/archi_intru/BomRoot.hpp 2010-09-13 06:32:16 UTC (rev 329)
+++ trunk/stdair/test/archi_intru/BomRoot.hpp 2010-09-13 06:49:06 UTC (rev 330)
@@ -20,18 +20,20 @@
/** BomRoot. */
class BomRoot : public BomAbstract {
+ template <typename BOM> friend class FacBom;
+ template <typename NODE> friend struct delete_disposer;
public:
/** Constructors. */
BomRoot (const std::string& iKey) : BomAbstract (iKey) {}
BomRoot (const int idx) : BomAbstract (idx) {}
- /** Destructor. */
- ~BomRoot() {}
private:
/** Default constructors.
<br>They are kept private, so as to forbid their use (only the
public constructors should be used). */
BomRoot () {}
BomRoot (const BomRoot&) {}
+ /** Destructor. */
+ ~BomRoot() {}
public:
bi::list_member_hook<> _childListHook;
Modified: trunk/stdair/test/archi_intru/FacRelationShipRoot.hpp
===================================================================
--- trunk/stdair/test/archi_intru/FacRelationShipRoot.hpp 2010-09-13 06:32:16 UTC (rev 329)
+++ trunk/stdair/test/archi_intru/FacRelationShipRoot.hpp 2010-09-13 06:49:06 UTC (rev 330)
@@ -49,8 +49,14 @@
public:
/** Constructor. */
- FacRelationShipRoot() : _relationShipHolderSet () {
- }
+ FacRelationShipRoot() : _relationShipHolderSet ("DefaultRSHSet") {}
+ private:
+ /** Default constructors.
+ <br>They are kept private, so as to forbid their use (only the
+ public constructors should be used). */
+ FacRelationShipRoot (const FacRelationShipRoot&) {}
+ /** Destructor. */
+ ~FacRelationShipRoot() {}
public:
/** Add a child/sibling to the dedicated list of the parent/sibling. */
Modified: trunk/stdair/test/archi_intru/FlightDate.hpp
===================================================================
--- trunk/stdair/test/archi_intru/FlightDate.hpp 2010-09-13 06:32:16 UTC (rev 329)
+++ trunk/stdair/test/archi_intru/FlightDate.hpp 2010-09-13 06:49:06 UTC (rev 330)
@@ -20,11 +20,14 @@
/** FlightDate. */
class FlightDate : public BomAbstract {
+ template <typename BOM> friend class FacBom;
+ template <typename NODE> friend struct delete_disposer;
public:
/** Constructors. */
FlightDate (const std::string& iKey) : BomAbstract (iKey) {}
FlightDate (const int idx) : BomAbstract (idx) {}
- /** Destructor. */
+ /** Destructor.
+ <br>Note: it should be private, but there is still a compilation bug. */
~FlightDate() {}
private:
/** Default constructors.
Modified: trunk/stdair/test/archi_intru/RelationShipHolder.hpp
===================================================================
--- trunk/stdair/test/archi_intru/RelationShipHolder.hpp 2010-09-13 06:32:16 UTC (rev 329)
+++ trunk/stdair/test/archi_intru/RelationShipHolder.hpp 2010-09-13 06:49:06 UTC (rev 330)
@@ -44,14 +44,14 @@
ioSecondBom.getKey())),
_firstBom (ioFirstBom) {
}
- /** Destructor. */
- ~RelationShipHolder() {}
private:
/** Default constructors.
<br>They are kept private, so as to forbid their use (only the
public constructors should be used). */
RelationShipHolder () {}
RelationShipHolder (const RelationShipHolder&) {}
+ /** Destructor. */
+ ~RelationShipHolder() {}
public:
bi::list_member_hook<> _childListHook;
Modified: trunk/stdair/test/archi_intru/RelationShipHolderAbstract.hpp
===================================================================
--- trunk/stdair/test/archi_intru/RelationShipHolderAbstract.hpp 2010-09-13 06:32:16 UTC (rev 329)
+++ trunk/stdair/test/archi_intru/RelationShipHolderAbstract.hpp 2010-09-13 06:49:06 UTC (rev 330)
@@ -25,7 +25,7 @@
_key = oStr.str();
}
/** Destructor. */
- ~RelationShipHolderAbstract() {}
+ virtual ~RelationShipHolderAbstract() {}
protected:
/** Default constructors.
Modified: trunk/stdair/test/archi_intru/RelationShipHolderSet.hpp
===================================================================
--- trunk/stdair/test/archi_intru/RelationShipHolderSet.hpp 2010-09-13 06:32:16 UTC (rev 329)
+++ trunk/stdair/test/archi_intru/RelationShipHolderSet.hpp 2010-09-13 06:49:06 UTC (rev 330)
@@ -23,6 +23,7 @@
children or a Bom object and its siblings. */
template <typename FIRST_BOM, typename SECOND_BOM>
class RelationShipHolderSet : public RelationShipHolderAbstract {
+ template <typename ONE, typename SECOND> friend class FacRelationShipRoot;
public:
// ///////////////////////////////////////////
/** Type definition for the specific relationship class. */
@@ -45,9 +46,18 @@
public:
/** Constructor. */
+ RelationShipHolderSet (const std::string& iKey)
+ : RelationShipHolderAbstract (iKey) {
+ }
+ private:
+ /** Default constructors.
+ <br>They are kept private, so as to forbid their use (only the
+ public constructors should be used). */
RelationShipHolderSet ()
- : RelationShipHolderAbstract ("RelationShipHolderSet") {
- }
+ : RelationShipHolderAbstract ("RelationShipHolderSet") {}
+ RelationShipHolderSet (const RelationShipHolderSet&) {}
+ /** Destructor. */
+ ~RelationShipHolderSet() {}
public:
bi::list_member_hook<> _childListHook;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
