|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r53124 - in sandbox/pinhole: boost boost/pinhole boost/pinhole/detail libs/pinhole/test
From: jmcintyre_at_[hidden]
Date: 2009-05-19 20:05:09
Author: jared
Date: 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
New Revision: 53124
URL: http://svn.boost.org/trac/boost/changeset/53124
Log:
pinhole - Builds on gcc with new features. TR1 support is temporarily removed.
Removed:
sandbox/pinhole/boost/pinhole/config.hpp
Text files modified:
sandbox/pinhole/boost/pinhole.hpp | 1
sandbox/pinhole/boost/pinhole/action_info.hpp | 6 ++--
sandbox/pinhole/boost/pinhole/category_iterator.hpp | 5 ++-
sandbox/pinhole/boost/pinhole/depth_first_iterator.hpp | 4 +-
sandbox/pinhole/boost/pinhole/detail/depth_first_iterator_base.hpp | 4 +-
sandbox/pinhole/boost/pinhole/detail/tokenizer.hpp | 10 +++++---
sandbox/pinhole/boost/pinhole/find.hpp | 6 ++--
sandbox/pinhole/boost/pinhole/path_filtered_iterator.hpp | 8 +++---
sandbox/pinhole/boost/pinhole/property_group.hpp | 42 ++++++++++++++++-----------------------
sandbox/pinhole/boost/pinhole/property_info.hpp | 16 +++++++-------
sandbox/pinhole/boost/pinhole/property_manager.hpp | 11 ++++-----
sandbox/pinhole/boost/pinhole/value.hpp | 2
sandbox/pinhole/libs/pinhole/test/test_depth_first_iterator.cpp | 1
sandbox/pinhole/libs/pinhole/test/test_path_filtered_iterator.cpp | 2 -
sandbox/pinhole/libs/pinhole/test/test_property_groups.cpp | 40 +++++++++++++++++--------------------
sandbox/pinhole/libs/pinhole/test/test_tokenizer.cpp | 40 ++++++++++++++++++++------------------
16 files changed, 93 insertions(+), 105 deletions(-)
Modified: sandbox/pinhole/boost/pinhole.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole.hpp (original)
+++ sandbox/pinhole/boost/pinhole.hpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -8,7 +8,6 @@
#ifndef BOOST_PROPERTY_PINHOLE
#define BOOST_PROPERTY_PINHOLE
-#include "pinhole/config.hpp"
#include "pinhole/property_group.hpp"
#include "pinhole/value.hpp"
Modified: sandbox/pinhole/boost/pinhole/action_info.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/action_info.hpp (original)
+++ sandbox/pinhole/boost/pinhole/action_info.hpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -12,8 +12,8 @@
#pragma warning(push)
#pragma warning( disable: 4561 4793 )
#endif
-#include <boost/tr1/type_traits.hpp>
-#include <boost/tr1/functional.hpp>
+#include <boost/type_traits.hpp>
+#include <boost/function.hpp>
#include <boost/lexical_cast.hpp>
#if defined(BOOST_MSVC)
#pragma warning(pop)
@@ -27,7 +27,7 @@
template<typename type> struct Internal;
public:
- typedef std::tr1::function<void ()> action_type;
+ typedef boost::function<void ()> action_type;
virtual ~action_info(){;}
Modified: sandbox/pinhole/boost/pinhole/category_iterator.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/category_iterator.hpp (original)
+++ sandbox/pinhole/boost/pinhole/category_iterator.hpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -10,8 +10,9 @@
#include <exception>
#include <stdexcept>
-#include <string>
-#include <boost/../../boost_sandbox/pinhole/boost/pinhole/property_group.hpp>
+
+#include "types.hpp"
+#include "property_group.hpp"
#if defined(BOOST_MSVC)
#pragma warning(push)
Deleted: sandbox/pinhole/boost/pinhole/config.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/config.hpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
+++ (empty file)
@@ -1,47 +0,0 @@
-// Pinhole pinhole.h file
-// Copyright Jared McIntyre 2007.
-// 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)
-
-// Some parts based on boost::regex config.hpp
-
-#ifndef BOOST_PINHOLE_CONFIG_HPP
-#define BOOST_PINHOLE_CONFIG_HPP
-
-#include <boost/config.hpp>
-
-/*****************************************************************************
- *
- * Set up dll import/export options:
- *
- ****************************************************************************/
-
-#if defined(BOOST_HAS_DECLSPEC) && (defined(BOOST_PINHOLE_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)) && !defined(BOOST_PINHOLE_STATIC_LINK)
-# if defined(BOOST_PINHOLE_SOURCE)
-# define BOOST_PINHOLE_DECL __declspec(dllexport)
-# define BOOST_PINHOLE_BUILD_DLL
-# else
-# define BOOST_PINHOLE_DECL __declspec(dllimport)
-# endif
-#endif
-
-#ifndef BOOST_PINHOLE_DECL
-# define BOOST_PINHOLE_DECL
-#endif
-
-/* Not currently supported
-
-#if !defined(BOOST_PINHOLE_NO_LIB) && !defined(BOOST_PINHOLE_SOURCE) && !defined(BOOST_ALL_NO_LIB) && defined(__cplusplus)
-# define BOOST_LIB_NAME boost_pinhole
-# if defined(BOOST_PINHOLE_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)
-# define BOOST_DYN_LINK
-# endif
-# ifdef BOOST_PINHOLE_DIAG
-# define BOOST_LIB_DIAGNOSTIC
-# endif
-# include <boost/config/auto_link.hpp>
-#endif
-*/
-
-#endif // BOOST_PINHOLE_CONFIG_HPP
Modified: sandbox/pinhole/boost/pinhole/depth_first_iterator.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/depth_first_iterator.hpp (original)
+++ sandbox/pinhole/boost/pinhole/depth_first_iterator.hpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -9,7 +9,7 @@
#define BOOST_DEPTH_FIRST_ITERATOR
#include <string>
-#include <boost/../../boost_sandbox/pinhole/boost/pinhole/detail/depth_first_iterator_base.hpp>
+#include "detail/depth_first_iterator_base.hpp"
namespace boost { namespace pinhole
{
@@ -27,7 +27,7 @@
base_type(x, end)
{
// required call by depth_first_iterator_base
- MoveIteratorToValidPosition();
+ base_type::MoveIteratorToValidPosition();
}
inline bool visit_children(property_group* property)
Modified: sandbox/pinhole/boost/pinhole/detail/depth_first_iterator_base.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/detail/depth_first_iterator_base.hpp (original)
+++ sandbox/pinhole/boost/pinhole/detail/depth_first_iterator_base.hpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -10,8 +10,8 @@
#include <exception>
#include <stdexcept>
-#include <string>
-#include <boost/../../boost_sandbox/pinhole/boost/pinhole/property_group.hpp>
+
+#include "../property_group.hpp"
#if defined(BOOST_MSVC)
#pragma warning(push)
Modified: sandbox/pinhole/boost/pinhole/detail/tokenizer.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/detail/tokenizer.hpp (original)
+++ sandbox/pinhole/boost/pinhole/detail/tokenizer.hpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -9,8 +9,8 @@
#define BOOST_PINHOLE_TOKENIZER
#include <vector>
-#include <boost/../../boost_sandbox/pinhole/boost/pinhole/exceptions.hpp>
-#include <boost/algorithm/string/find.hpp>
+#include "../exceptions.hpp"
+#include"../find.hpp"
namespace boost { namespace pinhole
{
@@ -62,7 +62,8 @@
size_t itemCount = 0;
- string_split_iterator splitItr= boost::make_split_iterator( std::make_pair(itr, itrEnd), boost::first_finder("/", is_equal()));
+ string_range range(itr, itrEnd);
+ string_split_iterator splitItr= boost::make_split_iterator( range, boost::first_finder("/", is_equal()));
while( splitItr!=string_split_iterator() )
{
boost::pinhole::detail::token_path::token newToken;
@@ -81,7 +82,8 @@
string_range dot_delim = boost::find_first( strSubToken, "." );
if( dot_delim )
{
- string_range equal_delim = boost::find_first( string_range(dot_delim.end(), strSubToken.end()), "=" );
+ string_range sub_range(dot_delim.end(), strSubToken.end());
+ string_range equal_delim = boost::find_first( sub_range, "=" );
if( equal_delim )
{
if( dot_delim.end() == equal_delim.begin() )
Modified: sandbox/pinhole/boost/pinhole/find.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/find.hpp (original)
+++ sandbox/pinhole/boost/pinhole/find.hpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -9,9 +9,9 @@
#define BOOST_PINHOLE_FIND
#include <vector>
-#include <boost\..\..\boost_sandbox\pinhole\boost\pinhole\detail\path.hpp>
-#include <boost\..\..\boost_sandbox\pinhole\boost\pinhole\detail\tokenizer.hpp>
-#include <boost\..\..\boost_sandbox\pinhole\boost\pinhole\path_filtered_iterator.hpp>
+
+#include "./detail/path.hpp"
+#include "path_filtered_iterator.hpp"
namespace boost { namespace pinhole
{
Modified: sandbox/pinhole/boost/pinhole/path_filtered_iterator.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/path_filtered_iterator.hpp (original)
+++ sandbox/pinhole/boost/pinhole/path_filtered_iterator.hpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -9,8 +9,8 @@
#define BOOST_PATH_FILTERED_ITERATOR
#include <string>
-#include <boost/../../boost_sandbox/pinhole/boost/pinhole/detail/depth_first_iterator_base.hpp>
-#include <boost/../../boost_sandbox/pinhole/boost/pinhole/detail/tokenizer.hpp>
+#include "detail/depth_first_iterator_base.hpp"
+#include "detail/tokenizer.hpp"
namespace boost { namespace pinhole
{
@@ -28,7 +28,7 @@
end_token = token_path.tokens.end();
// required call by depth_first_iterator_base
- MoveIteratorToValidPosition();
+ base_type::MoveIteratorToValidPosition();
}
explicit path_filter( std::string path, Iterator x, Iterator end ) :
@@ -39,7 +39,7 @@
end_token = token_path.tokens.end();
// required call by depth_first_iterator_base
- MoveIteratorToValidPosition();
+ base_type::MoveIteratorToValidPosition();
}
path_filter( const path_filter& other ) :
Modified: sandbox/pinhole/boost/pinhole/property_group.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/property_group.hpp (original)
+++ sandbox/pinhole/boost/pinhole/property_group.hpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -8,34 +8,33 @@
#ifndef BOOST_PROPERTY_GROUP
#define BOOST_PROPERTY_GROUP
+#include "types.hpp"
#include "map_key_value_iterators.hpp"
#include "property_info.hpp"
#include "action_info.hpp"
#include "property_manager.hpp"
-#include <set>
-#include <list>
#include <sstream>
#if defined(BOOST_MSVC)
#pragma warning(push)
#pragma warning( disable: 4561)
#endif
-#include <boost/tr1/memory.hpp>
-#include <boost/tr1/type_traits.hpp>
-#include <boost/tr1/functional.hpp>
+#include <boost/bind.hpp>
+#include <boost/type_traits.hpp>
+#include <boost/function.hpp>
#include <boost/static_assert.hpp>
#include <boost/any.hpp>
#if defined(BOOST_MSVC)
#pragma warning(pop)
#endif
-#define BOOST_SETTER(c) std::tr1::bind(c, this, std::tr1::placeholders::_1)
+#define BOOST_SETTER(c) boost::bind(c, this, _1)
#if defined(BOOST_MSVC) && (_MSC_VER > 1310) && (_MSC_VER <= 1400)
- #define BOOST_GETTER(c) std::tr1::bind(std::tr1::mem_fn(c), this)
+ #define BOOST_GETTER(c) boost::bind(boost::mem_fn(c), this)
#else
- #define BOOST_GETTER(c) std::tr1::bind(c, this)
+ #define BOOST_GETTER(c) boost::bind(c, this)
#endif
-#define BOOST_ACTION(c) std::tr1::bind(c, this)
+#define BOOST_ACTION(c) boost::bind(c, this)
namespace boost { namespace pinhole
{
@@ -55,9 +54,9 @@
};
template<typename T>
- inline std::tr1::function<void (const T&)> property_system_var_setter_builder(T &t)
+ inline boost::function<void (const T&)> property_system_var_setter_builder(T &t)
{
- return std::tr1::bind<void>(property_system_var_setter<T>(t), std::tr1::placeholders::_1);
+ return boost::bind<void>(property_system_var_setter<T>(t), _1);
}
#define BOOST_SETTER_VAR(c) boost::pinhole::property_system_var_setter_builder(c)
@@ -78,9 +77,9 @@
};
template<typename T>
- inline std::tr1::function<T ()> property_system_var_getter_builder(T &t)
+ inline boost::function<T ()> property_system_var_getter_builder(T &t)
{
- return std::tr1::bind<T>(property_system_var_getter<T>(t));
+ return boost::bind<T>(property_system_var_getter<T>(t));
}
#define BOOST_GETTER_VAR(c) boost::pinhole::property_system_var_getter_builder(c)
@@ -89,13 +88,6 @@
#define BOOST_SETTER_NONE boost::pinhole::no_setter_struct()
- class property_group;
-
- typedef std::set<std::string> category_collection;
- typedef std::list<property_group*> children_collection;
- typedef std::map<std::string, detail::property_info_base*> property_collection;
- typedef std::map<std::string, detail::action_info*> action_collection;
-
/**
* Manages a list of properties for an object. A property is defined by a
* string that is unique to the object and a set of getter and setter
@@ -334,7 +326,7 @@
{
// The system does not allow you to use pointers as property
// types due to the ambiguity of their use.
- BOOST_STATIC_ASSERT(false == std::tr1::is_pointer<Return_Type>::value);
+ BOOST_STATIC_ASSERT(false == boost::is_pointer<Return_Type>::value);
property_collection::const_iterator itemItr = m_properties.find(property);
@@ -370,7 +362,7 @@
{
// The system does not allow you to use pointers as property
// types due to the ambiguity of their use.
- BOOST_STATIC_ASSERT(false == std::tr1::is_pointer<Set_Type>::value);
+ BOOST_STATIC_ASSERT(false == boost::is_pointer<Set_Type>::value);
property_collection::const_iterator itemItr = m_properties.find(property);
@@ -723,7 +715,7 @@
*/
void add_action( std::string name,
std::string description,
- std::tr1::function<void ()> action )
+ boost::function<void ()> action )
{
detail::action_info *action_info = new detail::action_info();
@@ -762,8 +754,8 @@
template<typename Value_Type>
void internal_add_property( const std::string &name,
const std::string &description,
- std::tr1::function<void (const Value_Type&)> setter,
- std::tr1::function<Value_Type ()> getter,
+ boost::function<void (const Value_Type&)> setter,
+ boost::function<Value_Type ()> getter,
boost::any &metadata )
{
property_collection::iterator previousInstance = m_properties.find(name);
Modified: sandbox/pinhole/boost/pinhole/property_info.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/property_info.hpp (original)
+++ sandbox/pinhole/boost/pinhole/property_info.hpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -12,8 +12,8 @@
#pragma warning(push)
#pragma warning( disable: 4561 4793 )
#endif
-#include <boost/tr1/type_traits.hpp>
-#include <boost/tr1/functional.hpp>
+#include <boost/type_traits.hpp>
+#include <boost/function.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/format.hpp>
@@ -207,7 +207,7 @@
{
typedef boost::archive::iterators::mb_from_wchar<std::wstring::const_iterator> translator;
- std::wstring& value = getter();
+ const std::wstring& value = getter();
return std::string( translator(value.begin()), translator(value.end()) );
}
};
@@ -223,7 +223,7 @@
{
typedef boost::archive::iterators::wchar_from_mb<std::string::const_iterator> translator;
- std::string& value = getter();
+ const std::string& value = getter();
return std::wstring( translator(value.begin()), translator(value.end()) );
}
};
@@ -283,13 +283,13 @@
private:
public:
- typedef typename std::tr1::remove_reference<T>::type Value_Type;
- typedef std::tr1::function<void (const Value_Type&)> setter_type;
- typedef std::tr1::function<Value_Type ()> getter_type;
+ typedef typename boost::remove_reference<T>::type Value_Type;
+ typedef boost::function<void (const Value_Type&)> setter_type;
+ typedef boost::function<Value_Type ()> getter_type;
// The system does not allow you to use pointers as property
// types due to the ambiguity of their use.
- BOOST_STATIC_ASSERT(false == std::tr1::is_pointer<Value_Type>::value);
+ BOOST_STATIC_ASSERT(false == boost::is_pointer<Value_Type>::value);
setter_type setter;
getter_type getter;
Modified: sandbox/pinhole/boost/pinhole/property_manager.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/property_manager.hpp (original)
+++ sandbox/pinhole/boost/pinhole/property_manager.hpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -8,17 +8,16 @@
#ifndef BOOST_PROPERTY_MANAGER
#define BOOST_PROPERTY_MANAGER
+#include "types.hpp"
#include "exceptions.hpp"
#include "map_key_value_iterators.hpp"
#include "category_iterator.hpp"
-#include <set>
-#include <string>
#if defined(BOOST_MSVC)
#pragma warning(push)
#pragma warning( disable: 4561 4793 )
#endif
-#include <boost/tr1/memory.hpp>
+#include <boost/bind.hpp>
#include <boost/signals.hpp>
#include <boost/algorithm/string.hpp>
#if defined(BOOST_MSVC)
@@ -32,7 +31,7 @@
typedef std::set<std::string> category_collection;
typedef std::list<property_group*> children_collection;
- class BOOST_PINHOLE_DECL event_source
+ class event_source
{
public :
static event_source* instance()
@@ -72,10 +71,10 @@
};
- class BOOST_PINHOLE_DECL property_manager
+ class property_manager
{
public:
- typedef std::tr1::shared_ptr<property_manager> instance_type;
+ typedef boost::shared_ptr<property_manager> instance_type;
private:
static void deleter(property_manager* manager)
Modified: sandbox/pinhole/boost/pinhole/value.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/value.hpp (original)
+++ sandbox/pinhole/boost/pinhole/value.hpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -10,7 +10,7 @@
#include <vector>
#include <boost/foreach.hpp>
-#include <boost\..\..\boost_sandbox\pinhole\boost\pinhole\find.hpp>
+#include "find.hpp"
namespace boost { namespace pinhole
{
Modified: sandbox/pinhole/libs/pinhole/test/test_depth_first_iterator.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_depth_first_iterator.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_depth_first_iterator.cpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -121,7 +121,6 @@
int ct=0;
for( ; itr != itrEnd; ++itr, ++ct )
{
- property_group* prop = (*itr);
switch( ct )
{
case 0:
Modified: sandbox/pinhole/libs/pinhole/test/test_path_filtered_iterator.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_path_filtered_iterator.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_path_filtered_iterator.cpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -228,7 +228,6 @@
int ct=0;
for( ; itr != itrEnd; ++itr, ++ct )
{
- property_group* prop = (*itr);
switch( ct )
{
case 0:
@@ -258,7 +257,6 @@
int ct=0;
for( ; itr != itrEnd; ++itr, ++ct )
{
- property_group* prop = (*itr);
switch( ct )
{
case 0:
Modified: sandbox/pinhole/libs/pinhole/test/test_property_groups.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_property_groups.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_property_groups.cpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -8,8 +8,11 @@
// For more information, see http://www.boost.org
#define BOOST_TEST_MODULE PinholeLib
+#include <boost/bind.hpp>
+#include <boost/function.hpp>
#include <boost/test/unit_test.hpp>
-#include <boost/pinhole.hpp>
+#include <boost/pinhole/property_group.hpp>
+#include <boost/pinhole/property_manager.hpp>
using namespace std;
using namespace boost;
@@ -60,13 +63,11 @@
string m_string;
};
+
class TestPropertyGroup : public property_group
{
public:
-#if defined(BOOST_MSVC)
-#pragma warning(push)
-#pragma warning( disable: 4355 )
-#endif
+
TestPropertyGroup() : property_group( PROPERTY_GROUP_NAME, NULL ), m_child1( this ), m_child2( this )
{
m_bool_var = false;
@@ -80,9 +81,6 @@
add_category(PROPERTY_GROUP_CATEGORY2);
add_category(PROPERTY_GROUP_CATEGORY3);
}
-#if defined(BOOST_MSVC)
-#pragma warning(pop)
-#endif
TestPropertyChildGroup m_child1;
TestPropertyChildGroup m_child2;
@@ -132,9 +130,7 @@
property_manager::unregister_property_group( pPropertyGroup );
}
- /**
- * Adds a root property group.
- */
+
virtual void add_property_group( property_group *group )
{
++uiChildCount;
@@ -178,7 +174,7 @@
TestPropertyManager *p_manager;
};
-BOOST_AUTO_TEST_CASE( TestPropertyParent )
+BOOST_AUTO_TEST_CASE( TestPropertyParen9t )
{
TestPropertyGroup testGroup;
@@ -417,20 +413,20 @@
TestPropertyManagerGuard gaurd;
TestPropertyManager *p_manager = gaurd.p_manager;
- BOOST_CHECK_EQUAL( 0, p_manager->count() );
+ BOOST_CHECK_EQUAL( 0u, p_manager->count() );
TestPropertyGroup *p_pg1 = new TestPropertyGroup();
TestPropertyGroup *p_pg2 = new TestPropertyGroup();
- BOOST_CHECK_EQUAL( 2, p_manager->count() );
+ BOOST_CHECK_EQUAL( 2u, p_manager->count() );
delete( p_pg1 );
- BOOST_CHECK_EQUAL( 1, p_manager->count() );
+ BOOST_CHECK_EQUAL( 1u, p_manager->count() );
delete( p_pg2 );
- BOOST_CHECK_EQUAL( 0, p_manager->count() );
+ BOOST_CHECK_EQUAL( 0u, p_manager->count() );
}
BOOST_AUTO_TEST_CASE( TestCategoryCollectionInManager )
@@ -443,17 +439,17 @@
TestPropertyGroup pg1;
TestPropertyGroup pg2;
- BOOST_CHECK_EQUAL( 4, pCategoryCollection->size() );
+ BOOST_CHECK_EQUAL( 4u, pCategoryCollection->size() );
BOOST_CHECK( pCategoryCollection->end() != pCategoryCollection->find( "All" ) );
- BOOST_CHECK_EQUAL( 2, p_manager->count("All") );
+ BOOST_CHECK_EQUAL( 2u, p_manager->count("All") );
BOOST_CHECK( pCategoryCollection->end() != pCategoryCollection->find( PROPERTY_GROUP_CATEGORY1 ) );
- BOOST_CHECK_EQUAL( 2, p_manager->count(PROPERTY_GROUP_CATEGORY1) );
+ BOOST_CHECK_EQUAL( 2u, p_manager->count(PROPERTY_GROUP_CATEGORY1) );
BOOST_CHECK( pCategoryCollection->end() != pCategoryCollection->find( PROPERTY_GROUP_CATEGORY2 ) );
- BOOST_CHECK_EQUAL( 2, p_manager->count(PROPERTY_GROUP_CATEGORY2) );
+ BOOST_CHECK_EQUAL( 2u, p_manager->count(PROPERTY_GROUP_CATEGORY2) );
BOOST_CHECK( pCategoryCollection->end() != pCategoryCollection->find( PROPERTY_GROUP_CATEGORY3 ) );
- BOOST_CHECK_EQUAL( 2, p_manager->count(PROPERTY_GROUP_CATEGORY3) );
-}
\ No newline at end of file
+ BOOST_CHECK_EQUAL( 2u, p_manager->count(PROPERTY_GROUP_CATEGORY3) );
+}
Modified: sandbox/pinhole/libs/pinhole/test/test_tokenizer.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_tokenizer.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_tokenizer.cpp 2009-05-19 20:05:05 EDT (Tue, 19 May 2009)
@@ -24,45 +24,47 @@
// empty path
- BOOST_CHECK_EQUAL( process_path("", path), 0);
+ BOOST_CHECK_EQUAL( process_path("", path), 0u);
BOOST_CHECK_EQUAL( path.relative_path, false );
- BOOST_CHECK_EQUAL( path.tokens.size(), 0 );
+ BOOST_CHECK_EQUAL( path.tokens.size(), 0u );
// Simple relative path
- BOOST_CHECK_EQUAL( process_path("relative/", path), 1);
+ BOOST_CHECK_EQUAL( process_path("relative/", path), 1u);
BOOST_CHECK_EQUAL( path.relative_path, true );
- BOOST_CHECK_EQUAL( path.tokens.size(), 1 );
+ BOOST_CHECK_EQUAL( path.tokens.size(), 1u );
BOOST_CHECK_EQUAL( (*path.tokens.begin()).name, "relative" );
BOOST_CHECK( (*path.tokens.begin()).property.empty() );
BOOST_CHECK( (*path.tokens.begin()).value.empty() );
- BOOST_CHECK_EQUAL( process_path("relative", path), 1);
+ BOOST_CHECK_EQUAL( process_path("relative", path), 1u);
BOOST_CHECK_EQUAL( path.relative_path, true );
- BOOST_CHECK_EQUAL( path.tokens.size(), 1 );
+ BOOST_CHECK_EQUAL( path.tokens.size(), 1u );
BOOST_CHECK_EQUAL( (*path.tokens.begin()).name, "relative" );
BOOST_CHECK( (*path.tokens.begin()).property.empty() );
BOOST_CHECK( (*path.tokens.begin()).value.empty() );
// Simple fixed path
- BOOST_CHECK_EQUAL( process_path("/non-relative", path), 1);
- BOOST_CHECK_EQUAL( path.tokens.size(), 1 );
+ BOOST_CHECK_EQUAL( process_path("/non-relative", path), 1u);
+ BOOST_CHECK_EQUAL( path.relative_path, false );
+ BOOST_CHECK_EQUAL( path.tokens.size(), 1u );
BOOST_CHECK_EQUAL( (*path.tokens.begin()).name, "non-relative" );
BOOST_CHECK( (*path.tokens.begin()).property.empty() );
BOOST_CHECK( (*path.tokens.begin()).value.empty() );
- BOOST_CHECK_EQUAL( process_path("/non-relative/", path), 1);
- BOOST_CHECK_EQUAL( path.tokens.size(), 1 );
+ BOOST_CHECK_EQUAL( process_path("/non-relative/", path), 1u);
+ BOOST_CHECK_EQUAL( path.relative_path, false );
+ BOOST_CHECK_EQUAL( path.tokens.size(), 1u );
BOOST_CHECK_EQUAL( (*path.tokens.begin()).name, "non-relative" );
BOOST_CHECK( (*path.tokens.begin()).property.empty() );
BOOST_CHECK( (*path.tokens.begin()).value.empty() );
// multiple tokens
- BOOST_CHECK_EQUAL( process_path("first/second/third/fourth/fifth/", path), 5);
+ BOOST_CHECK_EQUAL( process_path("first/second/third/fourth/fifth/", path), 5u);
BOOST_CHECK_EQUAL( path.relative_path, true );
- BOOST_CHECK_EQUAL( path.tokens.size(), 5 );
+ BOOST_CHECK_EQUAL( path.tokens.size(), 5u );
int ct=0;
BOOST_FOREACH( const boost::pinhole::detail::token_path::token& token, path.tokens )
{
@@ -80,18 +82,18 @@
// simple property values
- BOOST_CHECK_EQUAL( process_path("name.property=value", path), 1);
+ BOOST_CHECK_EQUAL( process_path("name.property=value", path), 1u);
BOOST_CHECK_EQUAL( path.relative_path, true );
- BOOST_CHECK_EQUAL( path.tokens.size(), 1 );
+ BOOST_CHECK_EQUAL( path.tokens.size(), 1u );
BOOST_CHECK_EQUAL( (*path.tokens.begin()).name, "name" );
BOOST_CHECK_EQUAL( (*path.tokens.begin()).property, "property" );
BOOST_CHECK_EQUAL( (*path.tokens.begin()).value, "value" );
// multiple property values
- BOOST_CHECK_EQUAL( process_path("/first.a1=b2/second.c=d/third.f3=g4/fourth.h=/fifth.5=6", path), 5);
+ BOOST_CHECK_EQUAL( process_path("/first.a1=b2/second.c=d/third.f3=g4/fourth.h=/fifth.5=6", path), 5u);
BOOST_CHECK_EQUAL( path.relative_path, false );
- BOOST_CHECK_EQUAL( path.tokens.size(), 5 );
+ BOOST_CHECK_EQUAL( path.tokens.size(), 5u );
ct=0;
BOOST_FOREACH( const boost::pinhole::detail::token_path::token& token, path.tokens )
{
@@ -131,12 +133,12 @@
// spaces
- BOOST_CHECK_EQUAL( process_path(" relat ive ", path), 1);
+ BOOST_CHECK_EQUAL( process_path(" relat ive ", path), 1u);
BOOST_CHECK_EQUAL( (*path.tokens.begin()).name, " relat ive " );
BOOST_CHECK( (*path.tokens.begin()).property.empty() );
BOOST_CHECK( (*path.tokens.begin()).value.empty() );
- BOOST_CHECK_EQUAL( process_path(" relat ive / more spaces ", path), 2);
+ BOOST_CHECK_EQUAL( process_path(" relat ive / more spaces ", path), 2u);
ct=0;
BOOST_FOREACH( const boost::pinhole::detail::token_path::token& token, path.tokens )
{
@@ -155,7 +157,7 @@
++ct;
}
- BOOST_CHECK_EQUAL( process_path(" relat ive . som eSpaces = a value / more spaces . mor eSpaces = another value ", path), 2);
+ BOOST_CHECK_EQUAL( process_path(" relat ive . som eSpaces = a value / more spaces . mor eSpaces = another value ", path), 2u);
ct=0;
BOOST_FOREACH( const boost::pinhole::detail::token_path::token& token, path.tokens )
{
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