Subject: [Boost-commit] svn:boost r66126 - in sandbox/chrono/libs/system: build test
From: vicente.botet_at_[hidden]
Date: 2010-10-20 18:09:24
Author: viboes
Date: 2010-10-20 18:09:21 EDT (Wed, 20 Oct 2010)
New Revision: 66126
URL: http://svn.boost.org/trac/boost/changeset/66126
Log:
Chrono: System
* Use BOOST_SYMBOL_EXPORT for test as no part of the source
* remove BOOST_USE_WINDOWS_H as usage requirements
* Change BOOST_WINDOWS_API by BOOST_SYSTEM_WINDOWS_API and BOOST_POSIX_API by BOOST_SYSTEM_POSIX_API
* Add BOOST_SYSTEM_INLINED
Text files modified:
sandbox/chrono/libs/system/build/Jamfile.v2 | 2 +-
sandbox/chrono/libs/system/test/Jamfile.v2 | 4 +++-
sandbox/chrono/libs/system/test/dynamic_link_test.cpp | 4 ++--
sandbox/chrono/libs/system/test/error_code_test.cpp | 10 +++++-----
sandbox/chrono/libs/system/test/error_code_user_test.cpp | 6 +++---
sandbox/chrono/libs/system/test/system_error_test.cpp | 4 ++--
sandbox/chrono/libs/system/test/throw_test.cpp | 4 +---
7 files changed, 17 insertions(+), 17 deletions(-)
Modified: sandbox/chrono/libs/system/build/Jamfile.v2
==============================================================================
--- sandbox/chrono/libs/system/build/Jamfile.v2 (original)
+++ sandbox/chrono/libs/system/build/Jamfile.v2 2010-10-20 18:09:21 EDT (Wed, 20 Oct 2010)
@@ -12,7 +12,7 @@
: usage-requirements # pass these requirement to dependents (i.e. users)
<link>shared:<define>BOOST_SYSTEM_DYN_LINK=1
<link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
- <define>BOOST_USE_WINDOWS_H
+ #<define>BOOST_USE_WINDOWS_H
;
SOURCES = error_code ;
Modified: sandbox/chrono/libs/system/test/Jamfile.v2
==============================================================================
--- sandbox/chrono/libs/system/test/Jamfile.v2 (original)
+++ sandbox/chrono/libs/system/test/Jamfile.v2 2010-10-20 18:09:21 EDT (Wed, 20 Oct 2010)
@@ -9,8 +9,10 @@
project
: requirements
- <library>/boost/system//boost_system
+ #<library>/boost/system//boost_system
<toolset>msvc:<asynch-exceptions>on
+ <define>BOOST_SYSTEM_INLINED
+ <define>BOOST_USE_WINDOWS_H
;
lib throw_test
Modified: sandbox/chrono/libs/system/test/dynamic_link_test.cpp
==============================================================================
--- sandbox/chrono/libs/system/test/dynamic_link_test.cpp (original)
+++ sandbox/chrono/libs/system/test/dynamic_link_test.cpp 2010-10-20 18:09:21 EDT (Wed, 20 Oct 2010)
@@ -26,7 +26,7 @@
{
namespace system
{
- BOOST_SYSTEM_DECL void throw_test();
+ BOOST_SYMBOL_EXPORT void throw_test();
}
}
@@ -52,4 +52,4 @@
std::cout << " error: failed to catch boost::system::system_error\n";
return 1;
-}
\ No newline at end of file
+}
Modified: sandbox/chrono/libs/system/test/error_code_test.cpp
==============================================================================
--- sandbox/chrono/libs/system/test/error_code_test.cpp (original)
+++ sandbox/chrono/libs/system/test/error_code_test.cpp 2010-10-20 18:09:21 EDT (Wed, 20 Oct 2010)
@@ -30,10 +30,10 @@
// with a boost::system using directive increases use scenario coverage.
using namespace boost::system;
-# if defined( BOOST_WINDOWS_API )
+# if defined( BOOST_SYSTEM_WINDOWS_API )
# include "winerror.h"
# define BOOST_ACCESS_ERROR_MACRO ERROR_ACCESS_DENIED
-# elif defined( BOOST_POSIX_API )
+# elif defined( BOOST_SYSTEM_POSIX_API )
# define BOOST_ACCESS_ERROR_MACRO EACCES
# else
# error "Only supported for POSIX and Windows"
@@ -154,7 +154,7 @@
ec = error_code( -1, system_category() );
std::cout << "error_code message for -1 is \"" << ec.message() << "\"\n";
std::cout << "error_code message for 0 is \"" << ec_0_system.message() << "\"\n";
-#if defined(BOOST_WINDOWS_API)
+#if defined(BOOST_SYSTEM_WINDOWS_API)
// Borland appends newline, so just check text
BOOST_TEST( ec.message().substr(0,13) == "Unknown error" );
BOOST_TEST( ec_0_system.message().substr(0,36) == "The operation completed successfully" );
@@ -177,7 +177,7 @@
error_condition econd_ok;
std::cout << "error_condition message for -1 is \"" << econd.message() << "\"\n";
std::cout << "error_condition message for 0 is \"" << econd_ok.message() << "\"\n";
-#if defined(BOOST_WINDOWS_API)
+#if defined(BOOST_SYSTEM_WINDOWS_API)
// Borland appends newline, so just check text
BOOST_TEST( econd.message().substr(0,13) == "Unknown error" );
BOOST_TEST( econd_ok.message().substr(0,8) == "No error" );
@@ -196,7 +196,7 @@
BOOST_TEST( econd.message() != "" );
BOOST_TEST( econd.message().substr( 0, 13) != "Unknown error" );
-#ifdef BOOST_WINDOWS_API
+#ifdef BOOST_SYSTEM_WINDOWS_API
std::cout << "Windows tests...\n";
// these tests probe the Windows errc decoder
// test the first entry in the decoder table:
Modified: sandbox/chrono/libs/system/test/error_code_user_test.cpp
==============================================================================
--- sandbox/chrono/libs/system/test/error_code_user_test.cpp (original)
+++ sandbox/chrono/libs/system/test/error_code_user_test.cpp 2010-10-20 18:09:21 EDT (Wed, 20 Oct 2010)
@@ -22,7 +22,7 @@
#include <cstdio>
#include <boost/detail/lightweight_test.hpp>
-#ifdef BOOST_POSIX_API
+#ifdef BOOST_SYSTEM_POSIX_API
# include <sys/stat.h>
#else
# include <windows.h>
@@ -37,7 +37,7 @@
boost::system::error_code my_mkdir( const std::string & path )
{
return boost::system::error_code(
-# ifdef BOOST_POSIX_API
+# ifdef BOOST_SYSTEM_POSIX_API
::mkdir( path.c_str(), S_IRWXU|S_IRWXG|S_IROTH|S_IXOTH ) == 0 ? 0 : errno,
# else
::CreateDirectoryA( path.c_str(), 0 ) != 0 ? 0 : ::GetLastError(),
@@ -318,7 +318,7 @@
// check_out_of_memory(user_permission_denied, false);
// check_out_of_memory(user_out_of_memory, true);
//
-//# ifdef BOOST_WINDOWS_API
+//# ifdef BOOST_SYSTEM_WINDOWS_API
// check_success(boost::system::windows::success, true);
// check_success(boost::system::windows::access_denied, false);
// check_success(boost::system::windows::not_enough_memory, false);
Modified: sandbox/chrono/libs/system/test/system_error_test.cpp
==============================================================================
--- sandbox/chrono/libs/system/test/system_error_test.cpp (original)
+++ sandbox/chrono/libs/system/test/system_error_test.cpp 2010-10-20 18:09:21 EDT (Wed, 20 Oct 2010)
@@ -19,7 +19,7 @@
#include <iostream>
#include <string>
-#ifdef BOOST_WINDOWS_API
+#ifdef BOOST_SYSTEM_WINDOWS_API
#include <windows.h>
#endif
@@ -38,7 +38,7 @@
std::cout << "test " << desc << "\n what() returns \"" << ex.what() << "\"\n";
BOOST_TEST( ex.code().value() == v );
BOOST_TEST( ex.code().category() == system_category() );
-# ifdef BOOST_WINDOWS_API
+# ifdef BOOST_SYSTEM_WINDOWS_API
LANGID language_id;
# if !defined(__MINGW32__) && !defined(__CYGWIN__)
language_id = ::GetUserDefaultUILanguage();
Modified: sandbox/chrono/libs/system/test/throw_test.cpp
==============================================================================
--- sandbox/chrono/libs/system/test/throw_test.cpp (original)
+++ sandbox/chrono/libs/system/test/throw_test.cpp 2010-10-20 18:09:21 EDT (Wed, 20 Oct 2010)
@@ -15,15 +15,13 @@
// define BOOST_SYSTEM_SOURCE so that <boost/system/config.hpp> knows
// the library is being built (possibly exporting rather than importing code)
-#define BOOST_SYSTEM_SOURCE
#include <boost/system/system_error.hpp>
-
namespace boost
{
namespace system
{
- BOOST_SYSTEM_DECL void throw_test()
+ BOOST_SYMBOL_EXPORT void throw_test()
{
throw system_error(9999, system_category(), "boo boo");
}