[Boost-commit] svn:boost r71937 - sandbox/property/libs/property/test

Subject: [Boost-commit] svn:boost r71937 - sandbox/property/libs/property/test
From: eldiener_at_[hidden]
Date: 2011-05-14 09:54:54

Author: eldiener
Date: 2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
New Revision: 71937
URL: http://svn.boost.org/trac/boost/changeset/71937

Log:
Updated tests.
Added:
   sandbox/property/libs/property/test/test_data_impl.cpp
      - copied, changed from r71907, /sandbox/property/libs/property/test/test_data.cpp
   sandbox/property/libs/property/test/test_data_impl.hpp
      - copied, changed from r71907, /sandbox/property/libs/property/test/test_data.hpp
   sandbox/property/libs/property/test/test_data_predicate.hpp   (contents, props changed)
   sandbox/property/libs/property/test/test_function_impl.cpp   (contents, props changed)
   sandbox/property/libs/property/test/test_function_impl.hpp   (contents, props changed)
   sandbox/property/libs/property/test/test_function_value.hpp   (contents, props changed)
   sandbox/property/libs/property/test/test_functor_impl.hpp   (contents, props changed)
   sandbox/property/libs/property/test/test_functor_value.hpp   (contents, props changed)
Removed:
   sandbox/property/libs/property/test/test_data.cpp
   sandbox/property/libs/property/test/test_data.hpp
Text files modified: 
   sandbox/property/libs/property/test/test_auto_predicate.hpp                |     4 ++--                                    
   sandbox/property/libs/property/test/test_auto_value.hpp                    |    10 ++--------                              
   sandbox/property/libs/property/test/test_callable_value.hpp                |    10 ++--------                              
   sandbox/property/libs/property/test/test_data_impl.cpp                     |     2 +-                                      
   sandbox/property/libs/property/test/test_data_impl.hpp                     |     4 ++--                                    
   sandbox/property/libs/property/test/test_data_predicate_character.cpp      |     2 +-                                      
   sandbox/property/libs/property/test/test_data_predicate_enum.cpp           |     2 +-                                      
   sandbox/property/libs/property/test/test_data_predicate_floating_point.cpp |     2 +-                                      
   sandbox/property/libs/property/test/test_data_predicate_integer.cpp        |     2 +-                                      
   sandbox/property/libs/property/test/test_data_value.hpp                    |     8 +-------                                
   sandbox/property/libs/property/test/test_data_value_bool.cpp               |     2 --                                      
   sandbox/property/libs/property/test/test_data_value_character.cpp          |     2 +-                                      
   sandbox/property/libs/property/test/test_data_value_enum.cpp               |     2 +-                                      
   sandbox/property/libs/property/test/test_data_value_floating_point.cpp     |     2 +-                                      
   sandbox/property/libs/property/test/test_data_value_integer.cpp            |     2 +-                                      
   sandbox/property/libs/property/test/test_data_value_pointer.cpp            |     2 +-                                      
   sandbox/property/libs/property/test/test_data_value_user_defined.cpp       |     2 +-                                      
   sandbox/property/libs/property/test/test_enum.hpp                          |     1 +                                       
   sandbox/property/libs/property/test/test_function_value_bool.cpp           |     2 +-                                      
   sandbox/property/libs/property/test/test_function_value_character.cpp      |     2 +-                                      
   sandbox/property/libs/property/test/test_function_value_enum.cpp           |     2 +-                                      
   sandbox/property/libs/property/test/test_function_value_floating_point.cpp |     2 +-                                      
   sandbox/property/libs/property/test/test_function_value_integer.cpp        |     2 +-                                      
   sandbox/property/libs/property/test/test_function_value_pointer.cpp        |     2 +-                                      
   sandbox/property/libs/property/test/test_function_value_user_defined.cpp   |     2 +-                                      
   sandbox/property/libs/property/test/test_functor_value_bool.cpp            |     2 +-                                      
   sandbox/property/libs/property/test/test_functor_value_character.cpp       |     2 +-                                      
   sandbox/property/libs/property/test/test_functor_value_enum.cpp            |     2 +-                                      
   sandbox/property/libs/property/test/test_functor_value_floating_point.cpp  |     2 +-                                      
   sandbox/property/libs/property/test/test_functor_value_integer.cpp         |     2 +-                                      
   sandbox/property/libs/property/test/test_functor_value_pointer.cpp         |     2 +-                                      
   sandbox/property/libs/property/test/test_functor_value_user_defined.cpp    |     2 +-                                      
   sandbox/property/libs/property/test/test_global_data.hpp                   |    16 ++++++++++++----                        
   sandbox/property/libs/property/test/test_member_data.hpp                   |     8 ++------                                
   34 files changed, 49 insertions(+), 64 deletions(-)

Modified: sandbox/property/libs/property/test/test_auto_predicate.hpp
==============================================================================
--- sandbox/property/libs/property/test/test_auto_predicate.hpp	(original)
+++ sandbox/property/libs/property/test/test_auto_predicate.hpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -13,12 +13,12 @@
 extern prop_auto_predicate<double,default_policy_tag,predicate_failure_runtime_exception> p_gl_double_pred_err;
 extern prop_auto_predicate<test_enum> p_gl_enum_pred;
 
-class p_auto_class
+class p_auto_predicate_class
   {
   
   public:
   
-  p_auto_class();
+  p_auto_predicate_class();
   
   prop_auto_predicate<char,notification_boost_function,predicate_failure_runtime_exception> p_char_pred_ntf_err;
   prop_auto_predicate<int> p_int_pred;

Modified: sandbox/property/libs/property/test/test_auto_value.hpp
==============================================================================
--- sandbox/property/libs/property/test/test_auto_value.hpp	(original)
+++ sandbox/property/libs/property/test/test_auto_value.hpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -3,7 +3,6 @@
 
 #include "test_enum.hpp"
 #include "test_pod.hpp"
-#include "test_global_data.hpp"
 #include <boost/property/property_auto_value.hpp>
 #include <boost/property/property_notification_boost_function.hpp>
 
@@ -17,12 +16,12 @@
 extern prop_auto<test_enum> p_gl_enum;
 extern prop_auto<test_pod,notification_boost_function> p_gl_class_ntf;
 
-class p_auto_class
+class p_auto_value_class
   {
   
   public:
   
-  p_auto_class();
+  p_auto_value_class();
   
   prop_auto<char,notification_boost_function> p_char_ntf;
   prop_auto<int> p_int;
@@ -40,11 +39,6 @@
   static prop_auto<test_enum,notification_boost_function> p_st_enum_ntf;
   static prop_auto<test_pod const> p_st_class_const;
   
-  private:
-  
-  int some_int;
-  static int st_some_int;
-  
   };
   
 #endif

Modified: sandbox/property/libs/property/test/test_callable_value.hpp
==============================================================================
--- sandbox/property/libs/property/test/test_callable_value.hpp	(original)
+++ sandbox/property/libs/property/test/test_callable_value.hpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -3,7 +3,6 @@
 
 #include "test_enum.hpp"
 #include "test_pod.hpp"
-#include "test_global_data.hpp"
 #include <boost/property/property_callable_value.hpp>
 
 using namespace properties;
@@ -16,12 +15,12 @@
 extern prop_callable<test_enum,read_tag> p_gl_enum_const;
 extern prop_callable<test_pod const> p_gl_class_const;
 
-class p_callable_class
+class p_callable_value_class
   {
   
   public:
   
-  p_callable_class();
+  p_callable_value_class();
   
   prop_callable<char> p_char;
   prop_callable<int,read_tag> p_int_const;
@@ -39,11 +38,6 @@
   static prop_callable<test_enum> p_st_enum;
   static prop_callable<test_pod const> p_st_class_const;
   
-  private:
-  
-  int some_int_const;
-  static int st_some_int_const;
-  
   };
   
 #endif

Deleted: sandbox/property/libs/property/test/test_data.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_data.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
+++ (empty file)
@@ -1,25 +0,0 @@
-#include "test_data.hpp"
-
-char p_data_char;
-int p_data_int;
-double p_data_double;
-bool p_data_bool;
-int * p_data_pointer;
-test_enum p_data_enum;
-test_pod p_data_class;
-
-char p_data_class::p_char;
-int p_data_class::p_int;
-double p_data_class::p_double;
-bool p_data_class::p_bool;
-int * p_data_class::p_pointer;
-test_enum p_data_class::p_enum;
-test_pod p_data_class::p_class;
-
-char p_data_class::p_char_2;
-int p_data_class::p_int_2;
-double p_data_class::p_double_2;
-bool p_data_class::p_bool_2;
-int * p_data_class::p_pointer_2;
-test_enum p_data_class::p_enum_2;
-test_pod p_data_class::p_class_2;

Deleted: sandbox/property/libs/property/test/test_data.hpp
==============================================================================
--- sandbox/property/libs/property/test/test_data.hpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
+++ (empty file)
@@ -1,38 +0,0 @@
-#if !defined(TEST_DATA_HPP)
-#define TEST_DATA_HPP
-
-#include "test_enum.hpp"
-#include "test_pod.hpp"
-
-extern char p_data_char;
-extern int p_data_int;
-extern double p_data_double;
-extern bool p_data_bool;
-extern int * p_data_pointer;
-extern test_enum p_data_enum;
-extern test_pod p_data_class;
-
-class p_data_class
-  {
-  
-  public:
-  
-  static char p_char;
-  static int p_int;
-  static double p_double;
-  static bool p_bool;
-  static int * p_pointer;
-  static test_enum p_enum;
-  static test_pod p_class;
-  
-  static char p_char_2;
-  static int p_int_2;
-  static double p_double_2;
-  static bool p_bool_2;
-  static int * p_pointer_2;
-  static test_enum p_enum_2;
-  static test_pod p_class_2;
-  
-  };
-  
-#endif

Copied: sandbox/property/libs/property/test/test_data_impl.cpp (from r71907, /sandbox/property/libs/property/test/test_data.cpp)
==============================================================================
--- /sandbox/property/libs/property/test/test_data.cpp	(original)
+++ sandbox/property/libs/property/test/test_data_impl.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,4 +1,4 @@
-#include "test_data.hpp"
+#include "test_data_impl.hpp"
 
 char p_data_char;
 int p_data_int;

Copied: sandbox/property/libs/property/test/test_data_impl.hpp (from r71907, /sandbox/property/libs/property/test/test_data.hpp)
==============================================================================
--- /sandbox/property/libs/property/test/test_data.hpp	(original)
+++ sandbox/property/libs/property/test/test_data_impl.hpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
-#if !defined(TEST_DATA_HPP)
-#define TEST_DATA_HPP
+#if !defined(TEST_DATA_IMPL_HPP)
+#define TEST_DATA_IMPL_HPP
 
 #include "test_enum.hpp"
 #include "test_pod.hpp"

Added: sandbox/property/libs/property/test/test_data_predicate.hpp
==============================================================================
--- (empty file)
+++ sandbox/property/libs/property/test/test_data_predicate.hpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -0,0 +1,36 @@
+#if !defined(TEST_DATA_PREDICATE_HPP)
+#define TEST_DATA_PREDICATE_HPP
+
+#include "test_enum.hpp"
+#include "test_data_impl.hpp"
+#include <boost/property/property_data_predicate.hpp>
+#include <boost/property/property_notification_boost_function.hpp>
+#include <boost/property/property_predicate_failure_runtime_exception.hpp>
+
+using namespace properties;
+
+extern prop_data_predicate<char,&p_data_char,notification_boost_function,predicate_failure_runtime_exception> p_gl_char_pred_ntf_err;
+extern prop_data_predicate<int,&p_data_class::p_int_2,notification_boost_function> p_gl_int_pred_ntf;
+extern prop_data_predicate<double,&p_data_double,default_policy_tag,predicate_failure_runtime_exception> p_gl_double_pred_err;
+extern prop_data_predicate<test_enum,&p_data_enum> p_gl_enum_pred;
+
+class p_data_predicate_class
+  {
+  
+  public:
+  
+  p_data_predicate_class();
+  
+  prop_data_predicate<char,&p_data_class::p_char_2,notification_boost_function,predicate_failure_runtime_exception> p_char_pred_ntf_err;
+  prop_data_predicate<int,&p_data_class::p_int> p_int_pred;
+  prop_data_predicate<double,&p_data_class::p_double,notification_boost_function,predicate_failure_runtime_exception> p_double_pred_ntf_err;
+  prop_data_predicate<test_enum,&p_data_class::p_enum,default_policy_tag,predicate_failure_runtime_exception> p_enum_pred_err;
+  
+  static prop_data_predicate<char,&p_data_class::p_char> p_st_char_pred;
+  static prop_data_predicate<int,&p_data_int,notification_boost_function,predicate_failure_runtime_exception> p_st_int_pred_ntf_err;
+  static prop_data_predicate<double,&p_data_class::p_double_2,default_policy_tag,predicate_failure_runtime_exception> p_st_double_pred_err;
+  static prop_data_predicate<test_enum,&p_data_class::p_enum_2,notification_boost_function> p_st_enum_pred_ntf;
+  
+  };
+  
+#endif

Modified: sandbox/property/libs/property/test/test_data_predicate_character.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_data_predicate_character.cpp	(original)
+++ sandbox/property/libs/property/test/test_data_predicate_character.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_data_predicate.hpp>
+#include "test_data_predicate.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_data_predicate_enum.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_data_predicate_enum.cpp	(original)
+++ sandbox/property/libs/property/test/test_data_predicate_enum.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_data_predicate.hpp>
+#include "test_data_predicate.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_data_predicate_floating_point.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_data_predicate_floating_point.cpp	(original)
+++ sandbox/property/libs/property/test/test_data_predicate_floating_point.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_data_predicate.hpp>
+#include "test_data_predicate.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_data_predicate_integer.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_data_predicate_integer.cpp	(original)
+++ sandbox/property/libs/property/test/test_data_predicate_integer.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_data_predicate.hpp>
+#include "test_data_predicate.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_data_value.hpp
==============================================================================
--- sandbox/property/libs/property/test/test_data_value.hpp	(original)
+++ sandbox/property/libs/property/test/test_data_value.hpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -3,8 +3,7 @@
 
 #include "test_enum.hpp"
 #include "test_pod.hpp"
-#include "test_global_data.hpp"
-#include "test_data.hpp"
+#include "test_data_impl.hpp"
 #include <boost/property/property_data_value.hpp>
 #include <boost/property/property_notification_boost_function.hpp>
 
@@ -41,11 +40,6 @@
   static prop_data<test_enum,&p_data_enum> p_st_enum;
   static prop_data<test_pod const,&p_data_class::p_class_2> p_st_class_const;
   
-  private:
-  
-  static int st_some_int;
-  static int st_some_int_2;
-  
   };
   
 #endif

Modified: sandbox/property/libs/property/test/test_data_value_bool.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_data_value_bool.cpp	(original)
+++ sandbox/property/libs/property/test/test_data_value_bool.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -7,5 +7,3 @@
   return boost::report_errors();
   
   }
-
-#include "test_data.cpp"
\ No newline at end of file

Modified: sandbox/property/libs/property/test/test_data_value_character.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_data_value_character.cpp	(original)
+++ sandbox/property/libs/property/test/test_data_value_character.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_data_value.hpp>
+#include "test_data_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_data_value_enum.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_data_value_enum.cpp	(original)
+++ sandbox/property/libs/property/test/test_data_value_enum.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_data_value.hpp>
+#include "test_data_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_data_value_floating_point.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_data_value_floating_point.cpp	(original)
+++ sandbox/property/libs/property/test/test_data_value_floating_point.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_data_value.hpp>
+#include "test_data_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_data_value_integer.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_data_value_integer.cpp	(original)
+++ sandbox/property/libs/property/test/test_data_value_integer.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_data_value.hpp>
+#include "test_data_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_data_value_pointer.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_data_value_pointer.cpp	(original)
+++ sandbox/property/libs/property/test/test_data_value_pointer.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_data_value.hpp>
+#include "test_data_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_data_value_user_defined.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_data_value_user_defined.cpp	(original)
+++ sandbox/property/libs/property/test/test_data_value_user_defined.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_data_value.hpp>
+#include "test_data_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_enum.hpp
==============================================================================
--- sandbox/property/libs/property/test/test_enum.hpp	(original)
+++ sandbox/property/libs/property/test/test_enum.hpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -3,6 +3,7 @@
 
 enum test_enum
   {
+  e_test_default,
   e_test_first,
   e_test_second,
   e_test_third

Added: sandbox/property/libs/property/test/test_function_impl.cpp
==============================================================================
--- (empty file)
+++ sandbox/property/libs/property/test/test_function_impl.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -0,0 +1,230 @@
+#include "test_function_impl.hpp"
+#include "test_global_data.hpp"
+
+char p_function_char_read() 
+  {
+  return gld_char;
+  }
+  
+void p_function_char_write(char data) 
+  {
+  gld_char = data;
+  }
+  
+int p_function_int_read() 
+  {
+  return gld_int;
+  }
+  
+void p_function_int_write(int data) 
+  {
+  gld_int = data;
+  }
+  
+double p_function_double_read() 
+  {
+  return gld_double;
+  }
+  
+void p_function_double_write(double data) 
+  {
+  gld_double = data;
+  }
+  
+bool p_function_bool_read() 
+  {
+  return gld_bool;
+  }
+  
+void p_function_bool_write(bool data) 
+  {
+  gld_bool = data;
+  }
+  
+int * p_function_pointer_read() 
+  {
+  return gld_pointer;
+  }
+  
+void p_function_pointer_write(int * data) 
+  {
+  gld_pointer = data;
+  }
+  
+test_enum p_function_enum_read() 
+  {
+  return gld_enum;
+  }
+  
+void p_function_enum_write(test_enum data) 
+  {
+  gld_enum = data;
+  }
+  
+test_pod p_function_class_read() 
+  {
+  return gld_pod;
+  }
+  
+void p_function_class_write(test_pod data) 
+  {
+  gld_pod = data;
+  }
+
+char p_function_class::p_char_read() 
+  {
+  return st_char;
+  }
+  
+void p_function_class::p_char_write(char data) 
+  {
+  st_char = data;
+  }
+  
+int p_function_class::p_int_read() 
+  {
+  return st_int;
+  }
+  
+void p_function_class::p_int_write(int data) 
+  {
+  st_int = data;
+  }
+  
+double p_function_class::p_double_read() 
+  {
+  return st_double;
+  }
+  
+void p_function_class::p_double_write(double data) 
+  {
+  data = st_double;
+  }
+  
+bool p_function_class::p_bool_read() 
+  {
+  return st_bool;
+  }
+  
+void p_function_class::p_bool_write(bool data) 
+  {
+  st_bool = data;
+  }
+  
+int * p_function_class::p_pointer_read() 
+  {
+  return st_pointer; 
+  }
+  
+void p_function_class::p_pointer_write(int * data) 
+  {
+  st_pointer = data;
+  }
+  
+test_enum p_function_class::p_enum_read() 
+  {
+  return st_enum;
+  }
+  
+void p_function_class::p_enum_write(test_enum data) 
+  {
+  st_enum = data;
+  }
+  
+test_pod p_function_class::p_class_read() 
+  {
+  return st_pod;
+  }
+  
+void p_function_class::p_class_write(test_pod data) 
+  {
+  st_pod = data;
+  }
+  
+char p_function_class::p_char_read_2() 
+  {
+  return st_char_2; 
+  }
+  
+void p_function_class::p_char_write_2(char data) 
+  {
+  st_char_2 = data;
+  }
+  
+int p_function_class::p_int_read_2() 
+  {
+  return st_int_2;
+  }
+  
+void p_function_class::p_int_write_2(int data) 
+  {
+  st_int_2 = data;
+  }
+  
+double p_function_class::p_double_read_2() 
+  {
+  return st_double_2;
+  }
+  
+void p_function_class::p_double_write_2(double data) 
+  {
+  st_double_2 = data;
+  }
+  
+bool p_function_class::p_bool_read_2() 
+  {
+  return st_bool_2;
+  }
+  
+void p_function_class::p_bool_write_2(bool data) 
+  {
+  st_bool_2 = data;
+  }
+  
+int * p_function_class::p_pointer_read_2() 
+  {
+  return st_pointer_2;
+  }
+  
+void p_function_class::p_pointer_write_2(int * data) 
+  {
+  st_pointer_2 = data;
+  }
+  
+test_enum p_function_class::p_enum_read_2() 
+  {
+  return st_enum_2;
+  }
+  
+void p_function_class::p_enum_write_2(test_enum data) 
+  {
+  st_enum_2 = data;
+  }
+  
+test_pod p_function_class::p_class_read_2() 
+  {
+  return st_pod_2;
+  }
+  
+void p_function_class::p_class_write_2(test_pod data) 
+  {
+  st_pod_2 = data;
+  }
+
+char p_function_class::st_char(' ');
+int p_function_class::st_int(0);
+double p_function_class::st_double(0.0);
+bool p_function_class::st_bool(false);
+int * p_function_class::st_pointer(0);
+test_enum p_function_class::st_enum(e_test_first);
+test_pod p_function_class::st_pod;
+
+char p_function_class::st_char_2(' ');
+int p_function_class::st_int_2(0);
+double p_function_class::st_double_2(0.0);
+bool p_function_class::st_bool_2(false);
+int * p_function_class::st_pointer_2(0);
+test_enum p_function_class::st_enum_2(e_test_first);
+test_pod p_function_class::st_pod_2;
+
+#include "test_global_data.cpp"
\ No newline at end of file

Added: sandbox/property/libs/property/test/test_function_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/property/libs/property/test/test_function_impl.hpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -0,0 +1,75 @@
+#if !defined(TEST_FUNCTION_IMPL_HPP)
+#define TEST_FUNCTION_IMPL_HPP
+
+#include "test_enum.hpp"
+#include "test_pod.hpp"
+
+extern char p_function_char_read();
+extern void p_function_char_write(char);
+extern int p_function_int_read();
+extern void p_function_int_write(int);
+extern double p_function_double_read();
+extern void p_function_double_write(double);
+extern bool p_function_bool_read();
+extern void p_function_bool_write(bool);
+extern int * p_function_pointer_read();
+extern void p_function_pointer_write(int *);
+extern test_enum p_function_enum_read();
+extern void p_function_enum_write(test_enum);
+extern test_pod p_function_class_read();
+extern void p_function_class_write(test_pod);
+
+class p_function_class
+  {
+  
+  public:
+  
+  static char p_char_read();
+  static void p_char_write(char);
+  static int p_int_read();
+  static void p_int_write(int);
+  static double p_double_read();
+  static void p_double_write(double);
+  static bool p_bool_read();
+  static void p_bool_write(bool);
+  static int * p_pointer_read();
+  static void p_pointer_write(int *);
+  static test_enum p_enum_read();
+  static void p_enum_write(test_enum);
+  static test_pod p_class_read();
+  static void p_class_write(test_pod);
+  
+  static char p_char_read_2();
+  static void p_char_write_2(char);
+  static int p_int_read_2();
+  static void p_int_write_2(int);
+  static double p_double_read_2();
+  static void p_double_write_2(double);
+  static bool p_bool_read_2();
+  static void p_bool_write_2(bool);
+  static int * p_pointer_read_2();
+  static void p_pointer_write_2(int *);
+  static test_enum p_enum_read_2();
+  static void p_enum_write_2(test_enum);
+  static test_pod p_class_read_2();
+  static void p_class_write_2(test_pod);
+  
+  static char st_char;
+  static int st_int;
+  static double st_double;
+  static bool st_bool;
+  static int * st_pointer;
+  static test_enum st_enum;
+  static test_pod st_pod;
+
+  static char st_char_2;
+  static int st_int_2;
+  static double st_double_2;
+  static bool st_bool_2;
+  static int * st_pointer_2;
+  static test_enum st_enum_2;
+  static test_pod st_pod_2;
+
+  };
+  
+#endif

Added: sandbox/property/libs/property/test/test_function_value.hpp
==============================================================================
--- (empty file)
+++ sandbox/property/libs/property/test/test_function_value.hpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -0,0 +1,44 @@
+#if !defined(TEST_FUNCTION_VALUE_HPP)
+#define TEST_FUNCTION_VALUE_HPP
+
+#include "test_enum.hpp"
+#include "test_pod.hpp"
+#include "test_function_impl.hpp"
+#include <boost/property/property_function_value.hpp>
+
+using namespace properties;
+
+extern prop_function<char,&p_function_class::p_char_read,&p_function_class::p_char_write> p_gl_char;
+extern prop_function<int,&p_function_class::p_int_read_2,&p_function_class::p_int_write_2> p_gl_int;
+extern prop_read_function<double,&p_function_double_read> p_gl_double_const;
+extern prop_write_function<bool,&p_function_bool_write> p_gl_bool_write;
+extern prop_function<int *,&p_function_pointer_read,&p_function_pointer_write> p_gl_pointer;
+extern prop_read_function<test_enum,&p_function_class::p_enum_read> p_gl_enum_const;
+extern prop_read_function<test_pod,&p_function_class::p_class_read_2> p_gl_class_const;
+
+class p_function_value_class
+  {
+  
+  public:
+  
+  p_function_value_class();
+  
+  prop_function<char,&p_function_char_read,&p_function_char_write> p_char;
+  prop_read_function<int,&p_function_class::p_int_read> p_int_const;
+  prop_function<double,&p_function_class::p_double_read,&p_function_class::p_double_write> p_double;
+  prop_read_function<bool,&p_function_class::p_bool_read> p_bool_const;
+  prop_read_function<int *,&p_function_class::p_pointer_read> p_pointer_const;
+  prop_function<test_enum,&p_function_class::p_enum_read_2,&p_function_class::p_enum_write_2> p_enum;
+  prop_read_function<test_pod,&p_function_class_read> p_class_const;
+
+  static prop_write_function<char,&p_function_class::p_char_write_2> p_st_char;
+  static prop_function<int,&p_function_int_read,&p_function_int_write> p_st_int;
+  static prop_function<double,&p_function_class::p_double_read_2,&p_function_class::p_double_write_2> p_st_double;
+  static prop_function<bool,&p_function_class::p_bool_read_2,&p_function_class::p_bool_write_2> p_st_bool;
+  static prop_read_function<int *,&p_function_class::p_pointer_read_2> p_st_pointer_const;
+  static prop_read_function<test_enum,&p_function_enum_read> p_st_enum_const;
+  static prop_write_function<test_pod,&p_function_class::p_class_write> p_st_class_write;
+  
+  };
+  
+#endif

Modified: sandbox/property/libs/property/test/test_function_value_bool.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_function_value_bool.cpp	(original)
+++ sandbox/property/libs/property/test/test_function_value_bool.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_function_value.hpp>
+#include "test_function_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_function_value_character.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_function_value_character.cpp	(original)
+++ sandbox/property/libs/property/test/test_function_value_character.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_function_value.hpp>
+#include "test_function_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_function_value_enum.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_function_value_enum.cpp	(original)
+++ sandbox/property/libs/property/test/test_function_value_enum.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_function_value.hpp>
+#include "test_function_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_function_value_floating_point.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_function_value_floating_point.cpp	(original)
+++ sandbox/property/libs/property/test/test_function_value_floating_point.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_function_value.hpp>
+#include "test_function_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_function_value_integer.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_function_value_integer.cpp	(original)
+++ sandbox/property/libs/property/test/test_function_value_integer.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_function_value.hpp>
+#include "test_function_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_function_value_pointer.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_function_value_pointer.cpp	(original)
+++ sandbox/property/libs/property/test/test_function_value_pointer.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_function_value.hpp>
+#include "test_function_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_function_value_user_defined.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_function_value_user_defined.cpp	(original)
+++ sandbox/property/libs/property/test/test_function_value_user_defined.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_function_value.hpp>
+#include "test_function_value.hpp"
 
 int main()
   {

Added: sandbox/property/libs/property/test/test_functor_impl.hpp
==============================================================================
--- (empty file)
+++ sandbox/property/libs/property/test/test_functor_impl.hpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -0,0 +1,70 @@
+#if !defined(TEST_FUNCTOR_IMPL_HPP)
+#define TEST_FUNCTOR_IMPL_HPP
+
+#include "test_enum.hpp"
+#include "test_pod.hpp"
+
+class p_functor_class_char
+  {
+  
+  public:
+  
+  char operator()();
+  void operator()(char);
+  };
+
+class p_functor_class_int
+  {
+  
+  public:
+  
+  int operator()();
+  void operator()(int);
+  };
+
+class p_functor_class_double
+  {
+  
+  public:
+  
+  double operator()();
+  void operator()(double);
+  };
+
+class p_functor_class_bool
+  {
+  
+  public:
+  
+  bool operator()();
+  void operator()(bool);
+  };
+
+class p_functor_class_pointer
+  {
+  
+  public:
+  
+  int * operator()();
+  void operator()(int *);
+  };
+
+class p_functor_class_enum
+  {
+  
+  public:
+  
+  test_enum operator()();
+  void operator()(test_enum);
+  };
+
+class p_functor_class_pod
+  {
+  
+  public:
+  
+  test_pod operator()();
+  void operator()(test_pod);
+  };
+  
+#endif

Added: sandbox/property/libs/property/test/test_functor_value.hpp
==============================================================================
--- (empty file)
+++ sandbox/property/libs/property/test/test_functor_value.hpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -0,0 +1,44 @@
+#if !defined(TEST_FUNCTOR_VALUE_HPP)
+#define TEST_FUNCTOR_VALUE_HPP
+
+#include "test_enum.hpp"
+#include "test_pod.hpp"
+#include "test_functor_impl.hpp"
+#include <boost/property/property_functor_value.hpp>
+
+using namespace properties;
+
+extern prop_functor<char,p_functor_class_char> p_gl_char;
+extern prop_functor<int,p_functor_class_int> p_gl_int;
+extern prop_functor<double,p_functor_class_double> p_gl_double;
+extern prop_functor<bool,p_functor_class_bool,write_tag> p_gl_bool_write;
+extern prop_functor<int *,p_functor_class_pointer> p_gl_pointer;
+extern prop_functor<test_enum,p_functor_class_enum,read_tag> p_gl_enum_const;
+extern prop_functor<test_pod const,p_functor_class_pod> p_gl_class_const;
+
+class p_functor_value_class
+  {
+  
+  public:
+  
+  p_functor_value_class();
+  
+  prop_functor<char,p_functor_class_char> p_char;
+  prop_functor<int,p_functor_class_int> p_int;
+  prop_functor<double const,p_functor_class_double> p_double_const;
+  prop_functor<bool const,p_functor_class_bool> p_bool_const;
+  prop_functor<int *,p_functor_class_pointer,read_tag> p_pointer_const;
+  prop_functor<test_enum,p_functor_class_enum> p_enum;
+  prop_functor<test_pod,p_functor_class_pod,read_tag> p_class_const;
+
+  static prop_functor<char,p_functor_class_char> p_st_char;
+  static prop_functor<int,p_functor_class_int,read_tag> p_st_int_const;
+  static prop_functor<double,p_functor_class_double> p_st_double;
+  static prop_functor<bool,p_functor_class_bool> p_st_bool;
+  static prop_functor<int * const,p_functor_class_pointer> p_st_pointer_const;
+  static prop_functor<test_enum,p_functor_class_enum,read_tag> p_st_enum_const;
+  static prop_functor<test_pod,p_functor_class_pod,write_tag> p_st_class_write;
+  
+  };
+  
+#endif

Modified: sandbox/property/libs/property/test/test_functor_value_bool.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_functor_value_bool.cpp	(original)
+++ sandbox/property/libs/property/test/test_functor_value_bool.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_functor_value.hpp>
+#include "test_functor_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_functor_value_character.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_functor_value_character.cpp	(original)
+++ sandbox/property/libs/property/test/test_functor_value_character.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_functor_value.hpp>
+#include "test_functor_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_functor_value_enum.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_functor_value_enum.cpp	(original)
+++ sandbox/property/libs/property/test/test_functor_value_enum.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_functor_value.hpp>
+#include "test_functor_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_functor_value_floating_point.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_functor_value_floating_point.cpp	(original)
+++ sandbox/property/libs/property/test/test_functor_value_floating_point.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_functor_value.hpp>
+#include "test_functor_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_functor_value_integer.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_functor_value_integer.cpp	(original)
+++ sandbox/property/libs/property/test/test_functor_value_integer.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_functor_value.hpp>
+#include "test_functor_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_functor_value_pointer.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_functor_value_pointer.cpp	(original)
+++ sandbox/property/libs/property/test/test_functor_value_pointer.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_functor_value.hpp>
+#include "test_functor_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_functor_value_user_defined.cpp
==============================================================================
--- sandbox/property/libs/property/test/test_functor_value_user_defined.cpp	(original)
+++ sandbox/property/libs/property/test/test_functor_value_user_defined.cpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/property/property_functor_value.hpp>
+#include "test_functor_value.hpp"
 
 int main()
   {

Modified: sandbox/property/libs/property/test/test_global_data.hpp
==============================================================================
--- sandbox/property/libs/property/test/test_global_data.hpp	(original)
+++ sandbox/property/libs/property/test/test_global_data.hpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,7 +1,15 @@
-#if !defined(TEST_PROPERTY_GLOBAL_DATA_HPP)
-#define TEST_PROPERTY_GLOBAL_DATA_HPP
+#if !defined(TEST_GLOBAL_DATA_HPP)
+#define TEST_GLOBAL_DATA_HPP
 
-extern int gl_some_int;
-extern int gl_some_int_const;
+#include "test_enum.hpp"
+#include "test_pod.hpp"
+
+extern char gld_char;
+extern int gld_int;
+extern double gld_double;
+extern bool gld_bool;
+extern int * gld_pointer;
+extern test_enum gld_enum;
+extern test_pod gld_pod;
 
 #endif

Modified: sandbox/property/libs/property/test/test_member_data.hpp
==============================================================================
--- sandbox/property/libs/property/test/test_member_data.hpp	(original)
+++ sandbox/property/libs/property/test/test_member_data.hpp	2011-05-14 09:54:50 EDT (Sat, 14 May 2011)
@@ -1,5 +1,5 @@
-#if !defined(TEST_PROPERTY_MEMBER_DATA_HPP)
-#define TEST_PROPERTY_MEMBER_DATA_HPP
+#if !defined(TEST_MEMBER_DATA_HPP)
+#define TEST_MEMBER_DATA_HPP
 
 #include "test_enum.hpp"
 #include "test_pod.hpp"
@@ -19,10 +19,6 @@
   test_enum p_enum;
   test_pod p_class;
   
-  private:
-  
-  static int st_some_int;
-  
   };
   
 #endif