|
|
Boost-Commit : |
From: stipe_at_[hidden]
Date: 2008-08-11 22:34:33
Author: srajko
Date: 2008-08-11 22:34:32 EDT (Mon, 11 Aug 2008)
New Revision: 48097
URL: http://svn.boost.org/trac/boost/changeset/48097
Log:
rename entity to framework_entity
Added:
sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity/ (props changed)
- copied from r48096, /sandbox/dataflow-rewrite/boost/dataflow/generic/entity/
sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity.hpp
- copied, changed from r48096, /sandbox/dataflow-rewrite/boost/dataflow/generic/entity.hpp
sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_framework_entity.cpp
- copied, changed from r48096, /sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_entity.cpp
Removed:
sandbox/dataflow-rewrite/boost/dataflow/generic/entity/
sandbox/dataflow-rewrite/boost/dataflow/generic/entity.hpp
sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_entity.cpp
Text files modified:
sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity.hpp | 10 +++++-----
sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity/traits_sequence_intrusive_registration.hpp | 8 ++++----
sandbox/dataflow-rewrite/boost/dataflow/generic/traits.hpp | 2 +-
sandbox/dataflow-rewrite/libs/dataflow/build/xcodeide/dataflow.xcodeproj/project.pbxproj | 24 ++++++++++++------------
sandbox/dataflow-rewrite/libs/dataflow/test/generic/Jamfile | 2 +-
sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_framework_entity.cpp | 6 +++---
6 files changed, 26 insertions(+), 26 deletions(-)
Deleted: sandbox/dataflow-rewrite/boost/dataflow/generic/entity.hpp
==============================================================================
--- sandbox/dataflow-rewrite/boost/dataflow/generic/entity.hpp 2008-08-11 22:34:32 EDT (Mon, 11 Aug 2008)
+++ (empty file)
@@ -1,50 +0,0 @@
-// 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)
-
-#ifndef BOOST__DATAFLOW__GENERIC__ENTITY_HPP
-#define BOOST__DATAFLOW__GENERIC__ENTITY_HPP
-
-#include <boost/dataflow/generic/traits.hpp>
-#include <boost/dataflow/utility/enable_if_type.hpp>
-
-#include <boost/mpl/bool.hpp>
-
-namespace boost { namespace dataflow {
-
-namespace detail {
- struct enable_guard;
-}
-
-/// Boolean Metafunction determining whether a type has traits.
-template<typename T, typename Framework=default_framework, typename Enable=detail::enable_guard>
-struct is_entity : public mpl::false_
-{
-#ifdef DOXYGEN_DOCS_BUILD
- /// Integral Constant value type
- typedef bool value_type;
- /// true if T models Entity, false otherwise.
- typedef detail::unspecified value;
- /// Integral Constant
- typedef detail::unspecified type;
-#endif
- /// INTERNAL ONLY
- BOOST_MPL_ASSERT(( is_same<Enable, detail::enable_guard> ));
-};
-
-/// INTERNAL ONLY
-template<typename T, typename Framework>
-struct is_entity<
- T,
- Framework,
- typename utility::enable_if_type<
- typename traits_of<T, Framework>::type,
- detail::enable_guard
- >::type>
- : public mpl::true_
-{};
-
-} } // namespace boost::dataflow
-
-#endif // BOOST__DATAFLOW__GENERIC__ENTITY_HPP
Copied: sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity.hpp (from r48096, /sandbox/dataflow-rewrite/boost/dataflow/generic/entity.hpp)
==============================================================================
--- /sandbox/dataflow-rewrite/boost/dataflow/generic/entity.hpp (original)
+++ sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity.hpp 2008-08-11 22:34:32 EDT (Mon, 11 Aug 2008)
@@ -3,8 +3,8 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST__DATAFLOW__GENERIC__ENTITY_HPP
-#define BOOST__DATAFLOW__GENERIC__ENTITY_HPP
+#ifndef BOOST__DATAFLOW__GENERIC__FRAMEWORK_ENTITY_HPP
+#define BOOST__DATAFLOW__GENERIC__FRAMEWORK_ENTITY_HPP
#include <boost/dataflow/generic/traits.hpp>
#include <boost/dataflow/utility/enable_if_type.hpp>
@@ -19,7 +19,7 @@
/// Boolean Metafunction determining whether a type has traits.
template<typename T, typename Framework=default_framework, typename Enable=detail::enable_guard>
-struct is_entity : public mpl::false_
+struct is_framework_entity : public mpl::false_
{
#ifdef DOXYGEN_DOCS_BUILD
/// Integral Constant value type
@@ -35,7 +35,7 @@
/// INTERNAL ONLY
template<typename T, typename Framework>
-struct is_entity<
+struct is_framework_entity<
T,
Framework,
typename utility::enable_if_type<
@@ -47,4 +47,4 @@
} } // namespace boost::dataflow
-#endif // BOOST__DATAFLOW__GENERIC__ENTITY_HPP
+#endif // BOOST__DATAFLOW__GENERIC__FRAMEWORK_ENTITY_HPP
Modified: sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity/traits_sequence_intrusive_registration.hpp
==============================================================================
--- /sandbox/dataflow-rewrite/boost/dataflow/generic/entity/traits_sequence_intrusive_registration.hpp (original)
+++ sandbox/dataflow-rewrite/boost/dataflow/generic/framework_entity/traits_sequence_intrusive_registration.hpp 2008-08-11 22:34:32 EDT (Mon, 11 Aug 2008)
@@ -5,8 +5,8 @@
#if !BOOST_PP_IS_ITERATING
- #ifndef BOOST__DATAFLOW__GENERIC__ENTITY__TRAITS_SEQUENCE_INTRUSIVE_REGISTRATION_HPP
- #define BOOST__DATAFLOW__GENERIC__ENTITY__TRAITS_SEQUENCE_INTRUSIVE_REGISTRATION_HPP
+ #ifndef BOOST__DATAFLOW__GENERIC__FRAMEWORK_ENTITY__TRAITS_SEQUENCE_INTRUSIVE_REGISTRATION_HPP
+ #define BOOST__DATAFLOW__GENERIC__FRAMEWORK_ENTITY__TRAITS_SEQUENCE_INTRUSIVE_REGISTRATION_HPP
#include <boost/preprocessor/iteration/iterate.hpp>
@@ -30,10 +30,10 @@
} }
- #define BOOST_PP_ITERATION_PARAMS_1 (3, (0, 2, <boost/dataflow/generic/entity/traits_sequence_intrusive_registration.hpp>))
+ #define BOOST_PP_ITERATION_PARAMS_1 (3, (0, 2, <boost/dataflow/generic/framework_entity/traits_sequence_intrusive_registration.hpp>))
#include BOOST_PP_ITERATE()
- #endif // BOOST__DATAFLOW__GENERIC__ENTITY__TRAITS_SEQUENCE_INTRUSIVE_REGISTRATION_HPP
+ #endif // BOOST__DATAFLOW__GENERIC__FRAMEWORK_ENTITY__TRAITS_SEQUENCE_INTRUSIVE_REGISTRATION_HPP
#else
Modified: sandbox/dataflow-rewrite/boost/dataflow/generic/traits.hpp
==============================================================================
--- sandbox/dataflow-rewrite/boost/dataflow/generic/traits.hpp (original)
+++ sandbox/dataflow-rewrite/boost/dataflow/generic/traits.hpp 2008-08-11 22:34:32 EDT (Mon, 11 Aug 2008)
@@ -86,7 +86,7 @@
} }
// Specialization allowing intrusive specification of a sequence of Traits.
-#include <boost/dataflow/generic/entity/traits_sequence_intrusive_registration.hpp>
+#include <boost/dataflow/generic/framework_entity/traits_sequence_intrusive_registration.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-11 22:34:32 EDT (Mon, 11 Aug 2008)
@@ -78,15 +78,15 @@
/* Begin PBXFileReference section */
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; };
- 08A77ADB0E4FB06600B8793E /* entity.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = entity.hpp; sourceTree = "<group>"; };
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>"; };
- 08A77AF20E4FC34B00B8793E /* traits_sequence_intrusive_registration.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traits_sequence_intrusive_registration.hpp; sourceTree = "<group>"; };
- 08A77B000E4FC51C00B8793E /* test_entity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_entity.cpp; sourceTree = "<group>"; };
08A77B010E4FC51C00B8793E /* Jamfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.jam; path = Jamfile; sourceTree = "<group>"; };
08A77B060E4FC58D00B8793E /* Jamfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.jam; path = Jamfile; sourceTree = "<group>"; };
+ 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>"; };
/* End PBXFileReference section */
/* Begin PBXGroup section */
@@ -132,9 +132,9 @@
08A77ACD0E4F941C00B8793E /* generic */ = {
isa = PBXGroup;
children = (
- 08A77AF10E4FC34B00B8793E /* entity */,
- 08A77ADB0E4FB06600B8793E /* entity.hpp */,
08A77ADC0E4FB06600B8793E /* framework.hpp */,
+ 08B8F1AD0E512D31000545B8 /* framework_entity.hpp */,
+ 08B8F1AB0E512CF7000545B8 /* framework_entity */,
08A77ADD0E4FB06600B8793E /* traits.hpp */,
);
path = generic;
@@ -149,21 +149,21 @@
path = utility;
sourceTree = "<group>";
};
- 08A77AF10E4FC34B00B8793E /* entity */ = {
+ 08A77AFF0E4FC51C00B8793E /* generic */ = {
isa = PBXGroup;
children = (
- 08A77AF20E4FC34B00B8793E /* traits_sequence_intrusive_registration.hpp */,
+ 08B8F1B60E512DA3000545B8 /* test_framework_entity.cpp */,
+ 08A77B060E4FC58D00B8793E /* Jamfile */,
);
- path = entity;
+ path = generic;
sourceTree = "<group>";
};
- 08A77AFF0E4FC51C00B8793E /* generic */ = {
+ 08B8F1AB0E512CF7000545B8 /* framework_entity */ = {
isa = PBXGroup;
children = (
- 08A77B000E4FC51C00B8793E /* test_entity.cpp */,
- 08A77B060E4FC58D00B8793E /* Jamfile */,
+ 08B8F1AC0E512CF7000545B8 /* traits_sequence_intrusive_registration.hpp */,
);
- path = generic;
+ path = framework_entity;
sourceTree = "<group>";
};
08C675960C13A03E00D85379 /* test */ = {
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-11 22:34:32 EDT (Mon, 11 Aug 2008)
@@ -3,4 +3,4 @@
# accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
-run test_entity.cpp ;
+run test_framework_entity.cpp ;
Deleted: sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_entity.cpp
==============================================================================
--- sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_entity.cpp 2008-08-11 22:34:32 EDT (Mon, 11 Aug 2008)
+++ (empty file)
@@ -1,25 +0,0 @@
-// 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)
-
-#include <boost/dataflow/generic/entity.hpp>
-
-#include <boost/test/included/test_exec_monitor.hpp>
-
-namespace df = boost::dataflow;
-
-typedef df::traits<df::default_framework> my_traits;
-
-struct entity
-{
- typedef my_traits dataflow_traits;
-};
-
-int test_main(int, char* [])
-{
- BOOST_CHECK(df::is_traits<my_traits>::value);
- BOOST_CHECK(df::is_entity<entity>::value);
-
- return 0;
-} // int test_main(int, char* [])
Copied: sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_framework_entity.cpp (from r48096, /sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_entity.cpp)
==============================================================================
--- /sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_entity.cpp (original)
+++ sandbox/dataflow-rewrite/libs/dataflow/test/generic/test_framework_entity.cpp 2008-08-11 22:34:32 EDT (Mon, 11 Aug 2008)
@@ -3,7 +3,7 @@
// 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/dataflow/generic/entity.hpp>
+#include <boost/dataflow/generic/framework_entity.hpp>
#include <boost/test/included/test_exec_monitor.hpp>
@@ -11,7 +11,7 @@
typedef df::traits<df::default_framework> my_traits;
-struct entity
+struct framework_entity
{
typedef my_traits dataflow_traits;
};
@@ -19,7 +19,7 @@
int test_main(int, char* [])
{
BOOST_CHECK(df::is_traits<my_traits>::value);
- BOOST_CHECK(df::is_entity<entity>::value);
+ BOOST_CHECK(df::is_framework_entity<framework_entity>::value);
return 0;
} // int test_main(int, char* [])
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