[Boost-commit] svn:boost r74957 - in trunk/boost/test: . impl interaction tools

Subject: [Boost-commit] svn:boost r74957 - in trunk/boost/test: . impl interaction tools
From: gennadiy.rozental_at_[hidden]
Date: 2011-10-16 00:04:59

Author: rogeeff
Date: 2011-10-16 00:04:57 EDT (Sun, 16 Oct 2011)
New Revision: 74957
URL: http://svn.boost.org/trac/boost/changeset/74957

Log:
Eliminated some warnings
Reverted back to _MSC_VER
Properties modified: 
   trunk/boost/test/impl/execution_monitor.ipp   (contents, props changed)
Text files modified: 
   trunk/boost/test/impl/execution_monitor.ipp  |    12 +++++-------                            
   trunk/boost/test/impl/framework.ipp          |     2 +-                                      
   trunk/boost/test/interaction/mock_object.hpp |     2 +-                                      
   trunk/boost/test/progress_monitor.hpp        |     2 +-                                      
   trunk/boost/test/results_collector.hpp       |     2 +-                                      
   trunk/boost/test/tools/predicate_result.hpp  |     2 +-                                      
   trunk/boost/test/unit_test_log.hpp           |     2 +-                                      
   trunk/boost/test/unit_test_monitor.hpp       |     2 +-                                      
   8 files changed, 12 insertions(+), 14 deletions(-)

Modified: trunk/boost/test/impl/execution_monitor.ipp
==============================================================================
--- trunk/boost/test/impl/execution_monitor.ipp	(original)
+++ trunk/boost/test/impl/execution_monitor.ipp	2011-10-16 00:04:57 EDT (Sun, 16 Oct 2011)
@@ -67,7 +67,7 @@
 #ifdef BOOST_SEH_BASED_SIGNAL_HANDLING
 #  include <windows.h>
 
-#  if defined(__MWERKS__) || (defined(BOOST_MSVC) && !defined(UNDER_CE))
+#  if defined(__MWERKS__) || (defined(_MSC_VER) && !defined(UNDER_CE))
 #    include <eh.h>
 #  endif
 
@@ -79,11 +79,11 @@
     typedef unsigned uintptr_t;
 #  endif
 
-#  if BOOST_WORKAROUND(BOOST_MSVC,  < 1300 ) || defined(UNDER_CE)
+#  if BOOST_WORKAROUND(_MSC_VER,  < 1300 ) || defined(UNDER_CE)
 typedef void* uintptr_t;
 #  endif
 
-#  if !defined(NDEBUG) && defined(BOOST_MSVC) && !defined(UNDER_CE)
+#  if !defined(NDEBUG) && defined(_MSC_VER) && !defined(UNDER_CE)
 #    include <crtdbg.h>
 #    define BOOST_TEST_CRT_HOOK_TYPE    _CRT_REPORT_HOOK
 #    define BOOST_TEST_CRT_ASSERT       _CRT_ASSERT
@@ -96,9 +96,7 @@
 #    define BOOST_TEST_CRT_SET_HOOK(H)  (void*)(H)
 #  endif
 
-// como always sets BOOST_MSVC to 1310, regardless of the
-// actual underlying msvc version.
-#  if (!BOOST_WORKAROUND(BOOST_MSVC,  >= 1400 ) && \
+#  if (!BOOST_WORKAROUND(_MSC_VER,  >= 1400 ) && \
       !defined(BOOST_COMO)) || defined(UNDER_CE)
 
 typedef void* _invalid_parameter_handler;
@@ -184,7 +182,7 @@
 
 #ifdef __BORLANDC__
 #  define BOOST_TEST_VSNPRINTF( a1, a2, a3, a4 ) std::vsnprintf( (a1), (a2), (a3), (a4) )
-#elif BOOST_WORKAROUND(BOOST_MSVC, <= 1310) || \
+#elif BOOST_WORKAROUND(_MSC_VER, <= 1310) || \
       BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3000)) || \
       defined(UNDER_CE)
 #  define BOOST_TEST_VSNPRINTF( a1, a2, a3, a4 ) _vsnprintf( (a1), (a2), (a3), (a4) )

Modified: trunk/boost/test/impl/framework.ipp
==============================================================================
--- trunk/boost/test/impl/framework.ipp	(original)
+++ trunk/boost/test/impl/framework.ipp	2011-10-16 00:04:57 EDT (Sun, 16 Oct 2011)
@@ -110,7 +110,7 @@
                 m_kind  = SFK_MATCH;
                 m_name  = name;
             }
-        };
+        }
 
         bool            pass( test_unit const& tu ) const
         {

Modified: trunk/boost/test/interaction/mock_object.hpp
==============================================================================
--- trunk/boost/test/interaction/mock_object.hpp	(original)
+++ trunk/boost/test/interaction/mock_object.hpp	2011-10-16 00:04:57 EDT (Sun, 16 Oct 2011)
@@ -136,7 +136,7 @@
 class mock_object : public Base {
     // Private typeefs
     typedef mock_object<i,Base> self_type;
-    struct dummy { void nonnull() {}; };
+    struct dummy { void nonnull() {} };
     typedef void (dummy::*safe_bool)();
 
     // prototype constructor

Modified: trunk/boost/test/progress_monitor.hpp
==============================================================================
--- trunk/boost/test/progress_monitor.hpp	(original)
+++ trunk/boost/test/progress_monitor.hpp	2011-10-16 00:04:57 EDT (Sun, 16 Oct 2011)
@@ -54,7 +54,7 @@
     void    set_stream( std::ostream& );
 
 private:
-    BOOST_TEST_SINGLETON_CONS( progress_monitor_t );
+    BOOST_TEST_SINGLETON_CONS( progress_monitor_t )
 }; // progress_monitor_t
 
 BOOST_TEST_SINGLETON_INST( progress_monitor )

Modified: trunk/boost/test/results_collector.hpp
==============================================================================
--- trunk/boost/test/results_collector.hpp	(original)
+++ trunk/boost/test/results_collector.hpp	2011-10-16 00:04:57 EDT (Sun, 16 Oct 2011)
@@ -96,7 +96,7 @@
     test_results const& results( test_unit_id ) const;
 
 private:
-    BOOST_TEST_SINGLETON_CONS( results_collector_t );
+    BOOST_TEST_SINGLETON_CONS( results_collector_t )
 };
 
 BOOST_TEST_SINGLETON_INST( results_collector )

Modified: trunk/boost/test/tools/predicate_result.hpp
==============================================================================
--- trunk/boost/test/tools/predicate_result.hpp	(original)
+++ trunk/boost/test/tools/predicate_result.hpp	2011-10-16 00:04:57 EDT (Sun, 16 Oct 2011)
@@ -40,7 +40,7 @@
 
 class BOOST_TEST_DECL predicate_result {
     typedef unit_test::const_string      const_string;
-    struct dummy { void nonnull() {}; };
+    struct dummy { void nonnull() {} };
     typedef void (dummy::*safe_bool)();
 
 public:

Modified: trunk/boost/test/unit_test_log.hpp
==============================================================================
--- trunk/boost/test/unit_test_log.hpp	(original)
+++ trunk/boost/test/unit_test_log.hpp	2011-10-16 00:04:57 EDT (Sun, 16 Oct 2011)
@@ -129,7 +129,7 @@
     bool                log_entry_start();
     void                log_entry_context();
 
-    BOOST_TEST_SINGLETON_CONS( unit_test_log_t );
+    BOOST_TEST_SINGLETON_CONS( unit_test_log_t )
 }; // unit_test_log_t
 
 BOOST_TEST_SINGLETON_INST( unit_test_log )

Modified: trunk/boost/test/unit_test_monitor.hpp
==============================================================================
--- trunk/boost/test/unit_test_monitor.hpp	(original)
+++ trunk/boost/test/unit_test_monitor.hpp	2011-10-16 00:04:57 EDT (Sun, 16 Oct 2011)
@@ -51,7 +51,7 @@
     error_level execute_and_translate( boost::function<void ()> const& func, unsigned timeout = 0 );
 
 private:
-    BOOST_TEST_SINGLETON_CONS( unit_test_monitor_t );
+    BOOST_TEST_SINGLETON_CONS( unit_test_monitor_t )
 };
 
 BOOST_TEST_SINGLETON_INST( unit_test_monitor )