really screwy merge trancking behavior, starting over

[SVN r44394]
post-review proto version
2025-12-18 21:12:37 +01:00 · 2008-04-14 05:45:24 +00:00 · 2008-04-05 18:00:00 +00:00 · 2008-04-05 15:06:31 +00:00 · 2008-04-02 01:42:32 +00:00
8 changed files with 3 additions and 3 deletions
--- a/include/boost/detail/indirect_traits.hpp
+++ b/include/boost/detail/indirect_traits.hpp
--- a/include/boost/detail/interlocked.hpp
+++ b/include/boost/detail/interlocked.hpp
@@ -92,7 +92,7 @@ extern "C" void* __cdecl _InterlockedExchangePointer( void* volatile *, void* );
 # define BOOST_INTERLOCKED_EXCHANGE _InterlockedExchange
 # define BOOST_INTERLOCKED_EXCHANGE_ADD _InterlockedExchangeAdd

-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )

 namespace boost
 {
--- a/include/boost/detail/is_function_ref_tester.hpp
+++ b/include/boost/detail/is_function_ref_tester.hpp
--- a/include/boost/detail/is_incrementable.hpp
+++ b/include/boost/detail/is_incrementable.hpp
--- a/include/boost/detail/is_xxx.hpp
+++ b/include/boost/detail/is_xxx.hpp
--- a/include/boost/detail/utf8_codecvt_facet.hpp
+++ b/include/boost/detail/utf8_codecvt_facet.hpp
@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2001 Ronald Garcia, Indiana University (garcia@osl.iu.edu)
+// Copyright (c) 2001 Ronald Garcia, Indiana University (garcia@osl.iu.edu)
 // Andrew Lumsdaine, Indiana University (lums@osl.iu.edu).
 // Distributed under the Boost Software License, Version 1.0. (See accompany-
 // ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/include/boost/indirect_reference.hpp
+++ b/include/boost/indirect_reference.hpp
--- a/utf8_codecvt_facet.cpp
+++ b/utf8_codecvt_facet.cpp
@@ -1,7 +1,7 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // utf8_codecvt_facet.cpp

-// Copyright <EFBFBD> 2001 Ronald Garcia, Indiana University (garcia@osl.iu.edu)
+// Copyright (c) 2001 Ronald Garcia, Indiana University (garcia@osl.iu.edu)
 // Andrew Lumsdaine, Indiana University (lums@osl.iu.edu). 
 // Use, modification and distribution is subject to the Boost Software
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
Author	SHA1	Message	Date
Eric Niebler	a2132fbbd8	really screwy merge trancking behavior, starting over [SVN r44394]	2008-04-14 05:45:24 +00:00
Eric Niebler	e2fa3911a6	post-review proto version [SVN r44061]	2008-04-05 18:00:00 +00:00
Peter Dimov	e4054d843a	spinlock_nt.hpp added, Cygwin fixes. [SVN r44055]	2008-04-05 15:06:31 +00:00
Marshall Clow	9dcdea9efc	Replaced all occurrences of non-ASCII copyright symbol with '(c)' for people using non-ASCII code pages [SVN r43992]	2008-04-02 01:42:32 +00:00