Subject: [Boost-commit] svn:boost r73428 - in sandbox/mmap/boost/mmap: . detail mappble_objects/file mappble_objects/posix_file mappble_objects/win32_file
From: dsaritz_at_[hidden]
Date: 2011-07-29 05:35:44
Author: psiha
Date: 2011-07-29 05:35:42 EDT (Fri, 29 Jul 2011)
New Revision: 73428
URL: http://svn.boost.org/trac/boost/changeset/73428
Log:
Removed the include_impl_file.hpp header as it failed to work as expected with OS X/Clang.
Various other minor compiler error fixes and quick-fixes.
Added:
sandbox/mmap/boost/mmap/mappble_objects/file/flags.inl
- copied, changed from r73425, /sandbox/mmap/boost/mmap/mappble_objects/file/flags.hpp
sandbox/mmap/boost/mmap/mappble_objects/file/handle.inl
- copied, changed from r73425, /sandbox/mmap/boost/mmap/mappble_objects/file/handle.hpp
Removed:
sandbox/mmap/boost/mmap/detail/include_impl_file.hpp
Text files modified:
sandbox/mmap/boost/mmap/mappble_objects/file/flags.inl | 11 +++--------
sandbox/mmap/boost/mmap/mappble_objects/file/handle.inl | 35 +++--------------------------------
sandbox/mmap/boost/mmap/mappble_objects/posix_file/flags.hpp | 6 +++---
sandbox/mmap/boost/mmap/mappble_objects/posix_file/flags.inl | 17 +++++++++++++++++
sandbox/mmap/boost/mmap/mappble_objects/posix_file/handle.hpp | 6 ++++--
sandbox/mmap/boost/mmap/mappble_objects/win32_file/flags.hpp | 6 +++---
sandbox/mmap/boost/mmap/mappble_objects/win32_file/handle.hpp | 5 +++--
sandbox/mmap/boost/mmap/mapped_view.hpp | 14 +++++++++++---
8 files changed, 47 insertions(+), 53 deletions(-)
Deleted: sandbox/mmap/boost/mmap/detail/include_impl_file.hpp
==============================================================================
--- sandbox/mmap/boost/mmap/detail/include_impl_file.hpp 2011-07-29 05:35:42 EDT (Fri, 29 Jul 2011)
+++ (empty file)
@@ -1,11 +0,0 @@
-/// \note
-/// This file intentionally lacks header include guards.
-/// (28.07.2011.) (Domagoj Saric)
-
-#ifdef BOOST_MMAP_HEADER_ONLY
- #include BOOST_MMAP_IMPL_FILE
-#else
- // do nothing
-#endif // BOOST_MMAP_HEADER_ONLY
-
-#undef BOOST_MMAP_IMPL_FILE
\ No newline at end of file
Copied: sandbox/mmap/boost/mmap/mappble_objects/file/flags.inl (from r73425, /sandbox/mmap/boost/mmap/mappble_objects/file/flags.hpp)
==============================================================================
--- /sandbox/mmap/boost/mmap/mappble_objects/file/flags.hpp (original)
+++ sandbox/mmap/boost/mmap/mappble_objects/file/flags.inl 2011-07-29 05:35:42 EDT (Fri, 29 Jul 2011)
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
///
-/// \file flags.hpp
+/// \file flags.inl
/// ---------------
///
/// Copyright (c) Domagoj Saric 2010.-2011.
@@ -13,14 +13,9 @@
///
////////////////////////////////////////////////////////////////////////////////
//------------------------------------------------------------------------------
-#ifndef flags_hpp__BFFC0541_21AC_4A80_A9EE_E0450B6D4D8A
-#define flags_hpp__BFFC0541_21AC_4A80_A9EE_E0450B6D4D8A
-#pragma once
-//------------------------------------------------------------------------------
#ifdef _WIN32
-#include "../win32_file/flags.hpp"
+ #include "../win32_file/flags.inl"
#else
-#include "../posix_file/flags.hpp"
+ #include "../posix_file/flags.inl"
#endif
//------------------------------------------------------------------------------
-#endif // flags_hpp
Copied: sandbox/mmap/boost/mmap/mappble_objects/file/handle.inl (from r73425, /sandbox/mmap/boost/mmap/mappble_objects/file/handle.hpp)
==============================================================================
--- /sandbox/mmap/boost/mmap/mappble_objects/file/handle.hpp (original)
+++ sandbox/mmap/boost/mmap/mappble_objects/file/handle.inl 2011-07-29 05:35:42 EDT (Fri, 29 Jul 2011)
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
///
-/// \file handle.hpp
+/// \file handle.inl
/// ----------------
///
/// Copyright (c) Domagoj Saric 2010.-2011.
@@ -13,38 +13,9 @@
///
////////////////////////////////////////////////////////////////////////////////
//------------------------------------------------------------------------------
-#ifndef handle_hpp__D3705ED0_EC0D_4747_A789_1EE17252B6E2
-#define handle_hpp__D3705ED0_EC0D_4747_A789_1EE17252B6E2
-#pragma once
-//------------------------------------------------------------------------------
#ifdef _WIN32
-#include "../win32_file/handle.hpp"
+ #include "../win32_file/handle.inl"
#else
-#include "../posix_file/handle.hpp"
+ #include "../posix_file/handle.inl"
#endif
//------------------------------------------------------------------------------
-namespace boost
-{
-//------------------------------------------------------------------------------
-namespace mmap
-{
-//------------------------------------------------------------------------------
-namespace guard
-{
-//------------------------------------------------------------------------------
-
-#ifdef _WIN32
- typedef windows_handle native_handle;
-#else
- typedef posix_handle native_handle;
-#endif // _WIN32
-typedef native_handle::handle_t native_handle_t;
-
-//------------------------------------------------------------------------------
-} // namespace guard
-//------------------------------------------------------------------------------
-} // namespace mmap
-//------------------------------------------------------------------------------
-} // namespace boost
-//------------------------------------------------------------------------------
-#endif // handle_hpp
Modified: sandbox/mmap/boost/mmap/mappble_objects/posix_file/flags.hpp
==============================================================================
--- sandbox/mmap/boost/mmap/mappble_objects/posix_file/flags.hpp (original)
+++ sandbox/mmap/boost/mmap/mappble_objects/posix_file/flags.hpp 2011-07-29 05:35:42 EDT (Fri, 29 Jul 2011)
@@ -111,8 +111,8 @@
} // namespace boost
//------------------------------------------------------------------------------
-#undef BOOST_MMAP_IMPL_FILE
-#define BOOST_MMAP_IMPL_FILE "flags.inl"
-#include "../../detail/include_impl_file.hpp"
+#ifdef BOOST_MMAP_HEADER_ONLY
+ #include "flags.inl"
+#endif // BOOST_MMAP_HEADER_ONLY
#endif // flags_hpp
Modified: sandbox/mmap/boost/mmap/mappble_objects/posix_file/flags.inl
==============================================================================
--- sandbox/mmap/boost/mmap/mappble_objects/posix_file/flags.inl (original)
+++ sandbox/mmap/boost/mmap/mappble_objects/posix_file/flags.inl 2011-07-29 05:35:42 EDT (Fri, 29 Jul 2011)
@@ -92,6 +92,23 @@
return flags;
}
+
+BOOST_IMPL_INLINE
+posix_file_flags posix_file_flags::create_for_opening_existing_files( unsigned int const handle_access_flags, unsigned int const share_mode , bool const truncate, unsigned int const system_hints )
+{
+ return create
+ (
+ handle_access_flags,
+ share_mode,
+ truncate
+ ? open_policy::open_and_truncate_existing
+ : open_policy::open_existing,
+ system_hints,
+ 0
+ );
+}
+
+
//------------------------------------------------------------------------------
} // mmap
//------------------------------------------------------------------------------
Modified: sandbox/mmap/boost/mmap/mappble_objects/posix_file/handle.hpp
==============================================================================
--- sandbox/mmap/boost/mmap/mappble_objects/posix_file/handle.hpp (original)
+++ sandbox/mmap/boost/mmap/mappble_objects/posix_file/handle.hpp 2011-07-29 05:35:42 EDT (Fri, 29 Jul 2011)
@@ -44,6 +44,7 @@
{
public:
typedef int handle_t;
+ typedef posix_file_flags flags;
explicit posix_handle( handle_t );
#ifndef BOOST_MSVC
@@ -85,7 +86,8 @@
} // namespace boost
//------------------------------------------------------------------------------
-#define BOOST_MMAP_IMPL_FILE "handle.inl"
-#include "../../detail/include_impl_file.hpp"
+#ifdef BOOST_MMAP_HEADER_ONLY
+ #include "handle.inl"
+#endif
#endif // handle_hpp
Modified: sandbox/mmap/boost/mmap/mappble_objects/win32_file/flags.hpp
==============================================================================
--- sandbox/mmap/boost/mmap/mappble_objects/win32_file/flags.hpp (original)
+++ sandbox/mmap/boost/mmap/mappble_objects/win32_file/flags.hpp 2011-07-29 05:35:42 EDT (Fri, 29 Jul 2011)
@@ -110,8 +110,8 @@
} // namespace boost
//------------------------------------------------------------------------------
-#undef BOOST_MMAP_IMPL_FILE
-#define BOOST_MMAP_IMPL_FILE "flags.inl"
-#include "../../detail/include_impl_file.hpp"
+#ifdef BOOST_MMAP_HEADER_ONLY
+ #include "flags.inl"
+#endif // BOOST_MMAP_HEADER_ONLY
#endif // flags_hpp
Modified: sandbox/mmap/boost/mmap/mappble_objects/win32_file/handle.hpp
==============================================================================
--- sandbox/mmap/boost/mmap/mappble_objects/win32_file/handle.hpp (original)
+++ sandbox/mmap/boost/mmap/mappble_objects/win32_file/handle.hpp 2011-07-29 05:35:42 EDT (Fri, 29 Jul 2011)
@@ -71,7 +71,8 @@
} // namespace boost
//------------------------------------------------------------------------------
-#define BOOST_MMAP_IMPL_FILE "handle.inl"
-#include "../../detail/include_impl_file.hpp"
+#ifdef BOOST_MMAP_HEADER_ONLY
+ #include "handle.inl"
+#endif
#endif // handle_hpp
Modified: sandbox/mmap/boost/mmap/mapped_view.hpp
==============================================================================
--- sandbox/mmap/boost/mmap/mapped_view.hpp (original)
+++ sandbox/mmap/boost/mmap/mapped_view.hpp 2011-07-29 05:35:42 EDT (Fri, 29 Jul 2011)
@@ -17,8 +17,11 @@
#define mapped_view_hpp__D9C84FF5_E506_4ECB_9778_61E036048D28
#pragma once
//------------------------------------------------------------------------------
+//...zzz...
#include "mappble_objects/posix_file/handle.hpp"
+#ifdef _WIN32
#include "mappble_objects/win32_file/handle.hpp"
+#endif // _WIN32
#include "boost/assert.hpp"
#include "boost/noncopyable.hpp"
@@ -299,20 +302,25 @@
{
public:
mapped_view( mapped_view_reference<Element> const range ) : mapped_view_reference<Element>( range ) {}
- ~mapped_view<Element>() { boost::mapped_view_reference<Element>::unmap( *this ); }
+ ~mapped_view<Element>() { mapped_view_reference<Element>::unmap( *this ); }
#ifndef BOOST_MSVC
mapped_view( mapped_view const & ); // noncopyable
#endif // BOOST_MSVC
};
+
+basic_mapped_view_ref map_file ( char const * file_name, std::size_t desired_size );
+basic_mapped_read_only_view_ref map_read_only_file( char const * file_name );
+
//------------------------------------------------------------------------------
} // namespace mmap
//------------------------------------------------------------------------------
} // namespace boost
//------------------------------------------------------------------------------
-#define BOOST_MMAP_IMPL_FILE "mapped_view.inl"
-#include "detail/include_impl_file.hpp"
+#ifdef BOOST_MMAP_HEADER_ONLY
+ #include "mapped_view.inl"
+#endif
#endif // mapped_view_hpp