|
|
Boost-Commit : |
From: stipe_at_[hidden]
Date: 2008-08-12 12:30:27
Author: srajko
Date: 2008-08-12 12:30:25 EDT (Tue, 12 Aug 2008)
New Revision: 48104
URL: http://svn.boost.org/trac/boost/changeset/48104
Log:
reorganized files, changed copyright notice format, switched to linking with test framework
Added:
sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity/traits.hpp
- copied, changed from r48097, /sandbox/dataflow-rewrite/boost/dataflow/generic/traits.hpp
sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_framework.cpp (contents, props changed)
sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_framework_entity_traits.cpp (contents, props changed)
Removed:
sandbox/dataflow-rewrite/boost/dataflow/generic/traits.hpp
Text files modified:
sandbox/dataflow-rewrite/Jamroot | 11 +++++++----
sandbox/dataflow-rewrite/boost/dataflow/generic/framework.hpp | 12 ++++++++----
sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity.hpp | 14 +++++++++-----
sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity/traits.hpp | 16 ++++++++++------
sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity/traits_sequence_intrusive_registration.hpp | 11 +++++++----
sandbox/dataflow-rewrite/boost/dataflow/utility/enable_if_type.hpp | 11 +++++++----
sandbox/dataflow-rewrite/boost/dataflow/utility/is_type.hpp | 12 ++++++++----
sandbox/dataflow-rewrite/libs/dataflow/build/xcodeide/dataflow.xcodeproj/project.pbxproj | 10 +++++++---
sandbox/dataflow-rewrite/libs/dataflow/test/Jamfile | 13 +++++++++----
sandbox/dataflow-rewrite/libs/dataflow/test/generic/Jamfile | 14 ++++++++++----
sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_framework_entity.cpp | 22 +++++++++++++---------
11 files changed, 95 insertions(+), 51 deletions(-)
Modified: sandbox/dataflow-rewrite/Jamroot
==============================================================================
--- sandbox/dataflow-rewrite/Jamroot (original)
+++ sandbox/dataflow-rewrite/Jamroot 2008-08-12 12:30:25 EDT (Tue, 12 Aug 2008)
@@ -1,7 +1,10 @@
-# Copyright 2007-2008 Stjepan Rajko.
-# Distributed under the Boost Software License, Version 1.0. (See
-# accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
+#==================================---------------------------------------------
+# Copyright 2007,2008 Stjepan Rajko
+#
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+#----------------------------------------------===============================*/
import os ;
Modified: sandbox/dataflow-rewrite/boost/dataflow/generic/framework.hpp
==============================================================================
--- sandbox/dataflow-rewrite/boost/dataflow/generic/framework.hpp (original)
+++ sandbox/dataflow-rewrite/boost/dataflow/generic/framework.hpp 2008-08-12 12:30:25 EDT (Tue, 12 Aug 2008)
@@ -1,11 +1,15 @@
-// Copyright 2007,2008 Stjepan Rajko.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
+/*=================================---------------------------------------------
+ Copyright 2007,2008 Stjepan Rajko
+
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------===============================*/
#ifndef BOOST__DATAFLOW__GENERIC__FRAMEWORK_HPP
#define BOOST__DATAFLOW__GENERIC__FRAMEWORK_HPP
+
#include <boost/type_traits/is_base_of.hpp>
namespace boost { namespace dataflow {
Modified: sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity.hpp
==============================================================================
--- sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity.hpp (original)
+++ sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity.hpp 2008-08-12 12:30:25 EDT (Tue, 12 Aug 2008)
@@ -1,12 +1,16 @@
-// Copyright 2007,8 Stjepan Rajko.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
+/*=================================---------------------------------------------
+ Copyright 2007,2008 Stjepan Rajko
+
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------===============================*/
#ifndef BOOST__DATAFLOW__GENERIC__FRAMEWORK_ENTITY_HPP
#define BOOST__DATAFLOW__GENERIC__FRAMEWORK_ENTITY_HPP
-#include <boost/dataflow/generic/traits.hpp>
+
+#include <boost/dataflow/generic/framework_entity/traits.hpp>
#include <boost/dataflow/utility/enable_if_type.hpp>
#include <boost/mpl/bool.hpp>
Copied: sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity/traits.hpp (from r48097, /sandbox/dataflow-rewrite/boost/dataflow/generic/traits.hpp)
==============================================================================
--- /sandbox/dataflow-rewrite/boost/dataflow/generic/traits.hpp (original)
+++ sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity/traits.hpp 2008-08-12 12:30:25 EDT (Tue, 12 Aug 2008)
@@ -1,10 +1,14 @@
-// Copyright 2007,2008 Stjepan Rajko.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
+/*=================================---------------------------------------------
+ Copyright 2007,2008 Stjepan Rajko
+
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------===============================*/
+
+#ifndef BOOST__DATAFLOW__GENERIC__FRAMEWORK_ENTITY__TRAITS_HPP
+#define BOOST__DATAFLOW__GENERIC__FRAMEWORK_ENTITY__TRAITS_HPP
-#ifndef BOOST__DATAFLOW__GENERIC__TRAITS_HPP
-#define BOOST__DATAFLOW__GENERIC__TRAITS_HPP
#include <boost/dataflow/generic/framework.hpp>
#include <boost/dataflow/utility/enable_if_type.hpp>
Modified: sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity/traits_sequence_intrusive_registration.hpp
==============================================================================
--- sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity/traits_sequence_intrusive_registration.hpp (original)
+++ sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity/traits_sequence_intrusive_registration.hpp 2008-08-12 12:30:25 EDT (Tue, 12 Aug 2008)
@@ -1,7 +1,10 @@
-// Copyright 2007,2008 Stjepan Rajko.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
+/*=================================---------------------------------------------
+ Copyright 2007,2008 Stjepan Rajko
+
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------===============================*/
#if !BOOST_PP_IS_ITERATING
Deleted: sandbox/dataflow-rewrite/boost/dataflow/generic/traits.hpp
==============================================================================
--- sandbox/dataflow-rewrite/boost/dataflow/generic/traits.hpp 2008-08-12 12:30:25 EDT (Tue, 12 Aug 2008)
+++ (empty file)
@@ -1,154 +0,0 @@
-// Copyright 2007,2008 Stjepan Rajko.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST__DATAFLOW__GENERIC__TRAITS_HPP
-#define BOOST__DATAFLOW__GENERIC__TRAITS_HPP
-
-#include <boost/dataflow/generic/framework.hpp>
-#include <boost/dataflow/utility/enable_if_type.hpp>
-
-#include <boost/mpl/assert.hpp>
-#include <boost/mpl/bool.hpp>
-#include <boost/mpl/is_sequence.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/utility/enable_if.hpp>
-
-namespace boost { namespace dataflow {
-
-/// Convenience class for Traits types.
-template<typename Framework>
-struct traits
-{
- /// The Framework of the port.
- typedef Framework framework;
- /// INTERNAL ONLY
- BOOST_MPL_ASSERT(( is_framework<Framework> ));
-};
-
-namespace detail {
- struct enable_guard;
-}
-
-/// Boolean Metafunction determining whether a type is a Traits.
-template<typename Traits, typename Enable=detail::enable_guard>
-struct is_traits : public mpl::false_
-{
- /// INTERNAL ONLY
- BOOST_MPL_ASSERT(( is_same<Enable, detail::enable_guard> ));
-};
-
-/// INTERNAL ONLY
-template<typename Traits>
-struct is_traits<Traits,
- typename utility::enable_if_type<
- utility::all_of<
- typename Traits::framework
- >,
- detail::enable_guard
- >::type>
- : public mpl::true_
-{
- /// INTERNAL ONLY
- BOOST_MPL_ASSERT(( is_framework<typename Traits::framework> ));
-};
-
-/// Metafunction returning the Traits of a type.
-template<typename T, typename Framework=default_framework, typename Enable=void>
-struct traits_of
-{
-#ifdef DOXYGEN_DOCS_BUILD
- typedef detail::unspecified type; ///< Traits type.
-#endif
-};
-
-/// INTERNAL ONLY
-/** Specialization allowing intrusive specification of the Traits.
-*/
-template<typename T>
-struct traits_of<
- T,
- typename T::dataflow_traits::framework,
- typename enable_if<
- mpl::not_<mpl::is_sequence<typename T::dataflow_traits> >
- >::type
->
-{
- /// INTERNAL ONLY
- typedef typename T::dataflow_traits type;
- /// INTERNAL ONLY
- BOOST_MPL_ASSERT(( is_traits<type> ));
-};
-
-} }
-
-// Specialization allowing intrusive specification of a sequence of Traits.
-#include <boost/dataflow/generic/framework_entity/traits_sequence_intrusive_registration.hpp>
-
-namespace boost { namespace dataflow {
-
-/// Allows registration of Traits for all cv-qualified versions of a type.
-template<typename T, typename Framework=default_framework, typename Enable=void>
-struct register_traits
-{};
-
-
-// Specialization allowing non-intrusive specification of the Traits.
-
-/// INTERNAL ONLY
-template<typename T, typename Framework>
-struct traits_of<
- T,
- Framework,
- typename utility::enable_if_type<
- typename register_traits<
- typename remove_cv<T>::type,
- Framework
- >::type
- >::type
->
-{
- /// INTERNAL ONLY
- typedef
- typename register_traits<
- typename remove_cv<T>::type,
- Framework
- >::type type;
- /// INTERNAL ONLY
- BOOST_MPL_ASSERT(( is_traits<type> ));
-};
-
-} } // namespace boost::dataflow
-
-/// Macro simplifying non-intrusive specification of a type's Traits.
-#define DATAFLOW_TRAITS(Type,Traits) \
-namespace boost { namespace dataflow { \
-template<> \
-struct register_traits< \
- Type, \
- Traits::framework> \
-{ \
- typedef Traits type; \
- BOOST_MPL_ASSERT(( is_traits<type> )); \
-}; \
-}}
-
-/// Macro simplifying non-intrusive specification of multiple types'
-/// Traits, using a boost::enable_if condition.
-#define DATAFLOW_TRAITS_ENABLE_IF(Type,Cond,Traits) \
-namespace boost { namespace dataflow { \
-template<typename Type> \
-struct register_traits< \
- Type, \
- typename Traits::framework, \
- typename boost::enable_if< Cond >::type> \
-{ \
- typedef Traits type; \
- BOOST_MPL_ASSERT(( is_traits<type> )); \
-}; \
-}}
-
-#endif // BOOST__DATAFLOW__GENERIC__TRAITS_HPP
Modified: sandbox/dataflow-rewrite/boost/dataflow/utility/enable_if_type.hpp
==============================================================================
--- sandbox/dataflow-rewrite/boost/dataflow/utility/enable_if_type.hpp (original)
+++ sandbox/dataflow-rewrite/boost/dataflow/utility/enable_if_type.hpp 2008-08-12 12:30:25 EDT (Tue, 12 Aug 2008)
@@ -1,7 +1,10 @@
-// Copyright Stjepan Rajko 2007. Use, modification and
-// distribution is subject to the Boost Software License, Version
-// 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
+/*=================================---------------------------------------------
+ Copyright 2007,2008 Stjepan Rajko
+
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------===============================*/
#ifndef BOOST__DATAFLOW__UTILITY__ENABLE_IF_TYPE_HPP
#define BOOST__DATAFLOW__UTILITY__ENABLE_IF_TYPE_HPP
Modified: sandbox/dataflow-rewrite/boost/dataflow/utility/is_type.hpp
==============================================================================
--- sandbox/dataflow-rewrite/boost/dataflow/utility/is_type.hpp (original)
+++ sandbox/dataflow-rewrite/boost/dataflow/utility/is_type.hpp 2008-08-12 12:30:25 EDT (Tue, 12 Aug 2008)
@@ -1,11 +1,15 @@
-// Copyright 2007,2008 Stjepan Rajko.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
+/*=================================---------------------------------------------
+ Copyright 2007,2008 Stjepan Rajko
+
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------===============================*/
#ifndef BOOST__DATAFLOW__UTILITY__IS_TYPE_HPP
#define BOOST__DATAFLOW__UTILITY__IS_TYPE_HPP
+
#include <boost/mpl/bool.hpp>
namespace boost { namespace dataflow {
Modified: sandbox/dataflow-rewrite/libs/dataflow/build/xcodeide/dataflow.xcodeproj/project.pbxproj
==============================================================================
--- sandbox/dataflow-rewrite/libs/dataflow/build/xcodeide/dataflow.xcodeproj/project.pbxproj (original)
+++ sandbox/dataflow-rewrite/libs/dataflow/build/xcodeide/dataflow.xcodeproj/project.pbxproj 2008-08-12 12:30:25 EDT (Tue, 12 Aug 2008)
@@ -79,7 +79,6 @@
08A77AB30E4F91AA00B8793E /* Jamroot */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Jamroot; path = ../../../../Jamroot; sourceTree = SOURCE_ROOT; };
08A77AB40E4F91AB00B8793E /* LICENSE_1_0.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE_1_0.txt; path = ../../../../LICENSE_1_0.txt; sourceTree = SOURCE_ROOT; };
08A77ADC0E4FB06600B8793E /* framework.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = framework.hpp; sourceTree = "<group>"; };
- 08A77ADD0E4FB06600B8793E /* traits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traits.hpp; sourceTree = "<group>"; };
08A77AED0E4FB4C800B8793E /* enable_if_type.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = enable_if_type.hpp; sourceTree = "<group>"; };
08A77AEE0E4FB4C800B8793E /* is_type.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = is_type.hpp; sourceTree = "<group>"; };
08A77B010E4FC51C00B8793E /* Jamfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.jam; path = Jamfile; sourceTree = "<group>"; };
@@ -87,6 +86,9 @@
08B8F1AC0E512CF7000545B8 /* traits_sequence_intrusive_registration.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traits_sequence_intrusive_registration.hpp; sourceTree = "<group>"; };
08B8F1AD0E512D31000545B8 /* framework_entity.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = framework_entity.hpp; sourceTree = "<group>"; };
08B8F1B60E512DA3000545B8 /* test_framework_entity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_framework_entity.cpp; sourceTree = "<group>"; };
+ 08B8F1BE0E512E72000545B8 /* traits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traits.hpp; sourceTree = "<group>"; };
+ 08B8F1C00E512F45000545B8 /* test_framework_entity_traits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_framework_entity_traits.cpp; sourceTree = "<group>"; };
+ 08B8F1D00E513569000545B8 /* test_framework.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_framework.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXGroup section */
@@ -135,7 +137,6 @@
08A77ADC0E4FB06600B8793E /* framework.hpp */,
08B8F1AD0E512D31000545B8 /* framework_entity.hpp */,
08B8F1AB0E512CF7000545B8 /* framework_entity */,
- 08A77ADD0E4FB06600B8793E /* traits.hpp */,
);
path = generic;
sourceTree = "<group>";
@@ -152,8 +153,10 @@
08A77AFF0E4FC51C00B8793E /* generic */ = {
isa = PBXGroup;
children = (
- 08B8F1B60E512DA3000545B8 /* test_framework_entity.cpp */,
08A77B060E4FC58D00B8793E /* Jamfile */,
+ 08B8F1D00E513569000545B8 /* test_framework.cpp */,
+ 08B8F1B60E512DA3000545B8 /* test_framework_entity.cpp */,
+ 08B8F1C00E512F45000545B8 /* test_framework_entity_traits.cpp */,
);
path = generic;
sourceTree = "<group>";
@@ -161,6 +164,7 @@
08B8F1AB0E512CF7000545B8 /* framework_entity */ = {
isa = PBXGroup;
children = (
+ 08B8F1BE0E512E72000545B8 /* traits.hpp */,
08B8F1AC0E512CF7000545B8 /* traits_sequence_intrusive_registration.hpp */,
);
path = framework_entity;
Modified: sandbox/dataflow-rewrite/libs/dataflow/test/Jamfile
==============================================================================
--- sandbox/dataflow-rewrite/libs/dataflow/test/Jamfile (original)
+++ sandbox/dataflow-rewrite/libs/dataflow/test/Jamfile 2008-08-12 12:30:25 EDT (Tue, 12 Aug 2008)
@@ -1,13 +1,18 @@
-# Copyright 2007 Stjepan Rajko.
-# Distributed under the Boost Software License, Version 1.0. (See
-# accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
+#==================================---------------------------------------------
+# Copyright 2008 Stjepan Rajko
+#
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+#----------------------------------------------===============================*/
+
import testing ;
project dataflow/test
: requirements
<define>BOOST_ALL_NO_LIB=1
+ <library>/boost/test//boost_unit_test_framework/<link>static
;
build-project generic ;
Modified: sandbox/dataflow-rewrite/libs/dataflow/test/generic/Jamfile
==============================================================================
--- sandbox/dataflow-rewrite/libs/dataflow/test/generic/Jamfile (original)
+++ sandbox/dataflow-rewrite/libs/dataflow/test/generic/Jamfile 2008-08-12 12:30:25 EDT (Tue, 12 Aug 2008)
@@ -1,6 +1,12 @@
-# Copyright 2008 Stjepan Rajko.
-# Distributed under the Boost Software License, Version 1.0. (See
-# accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
+#==================================---------------------------------------------
+# Copyright 2008 Stjepan Rajko
+#
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+#----------------------------------------------===============================*/
+
+run test_framework.cpp ;
run test_framework_entity.cpp ;
+run test_framework_entity_traits.cpp ;
\ No newline at end of file
Added: sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_framework.cpp
==============================================================================
--- (empty file)
+++ sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_framework.cpp 2008-08-12 12:30:25 EDT (Tue, 12 Aug 2008)
@@ -0,0 +1,23 @@
+/*=================================---------------------------------------------
+ Copyright 2007,2008 Stjepan Rajko
+
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------===============================*/
+
+
+#include <boost/dataflow/generic/framework.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
+
+
+namespace df = boost::dataflow;
+
+BOOST_AUTO_TEST_CASE( test )
+{
+}
+
+
+
Modified: sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_framework_entity.cpp
==============================================================================
--- sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_framework_entity.cpp (original)
+++ sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_framework_entity.cpp 2008-08-12 12:30:25 EDT (Tue, 12 Aug 2008)
@@ -1,11 +1,17 @@
-// Copyright Stjepan Rajko 2007. Use, modification and
-// distribution is subject to the Boost Software License, Version
-// 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
+/*=================================---------------------------------------------
+ Copyright 2007,2008 Stjepan Rajko
+
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------===============================*/
+
#include <boost/dataflow/generic/framework_entity.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
+
namespace df = boost::dataflow;
@@ -16,10 +22,8 @@
typedef my_traits dataflow_traits;
};
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test )
{
BOOST_CHECK(df::is_traits<my_traits>::value);
BOOST_CHECK(df::is_framework_entity<framework_entity>::value);
-
- return 0;
-} // int test_main(int, char* [])
+}
Added: sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_framework_entity_traits.cpp
==============================================================================
--- (empty file)
+++ sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_framework_entity_traits.cpp 2008-08-12 12:30:25 EDT (Tue, 12 Aug 2008)
@@ -0,0 +1,23 @@
+/*=================================---------------------------------------------
+ Copyright 2007,2008 Stjepan Rajko
+
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------===============================*/
+
+
+#include <boost/dataflow/generic/framework_entity.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
+
+
+namespace df = boost::dataflow;
+
+typedef df::traits<df::default_framework> my_traits;
+
+BOOST_AUTO_TEST_CASE( test )
+{
+ BOOST_CHECK(df::is_traits<my_traits>::value);
+}
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk