Update of /cvsroot/boost/boost/boost/mpi/python
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28758/python

Modified Files:
        serialize.hpp skeleton_and_content.hpp 
Added Files:
        config.hpp 
Log Message:
boost\archive\detail\basic_iarchive: Remove some bogus declspecs

Boost.MPI: Added support for Windows auto-linking

--- NEW FILE: config.hpp ---
// Copyright (C) 2006 Douglas Gregor <doug.gregor -at- gmail.com>

// Use, modification and distribution is subject to the Boost Software
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)

/** @file config.hpp
 *
 *  This header provides auto-linking and configuration support for the 
 *  Boost.MPI python bindings.
 */
#ifndef BOOST_MPI_PYTHON_CONFIG_HPP
#define BOOST_MPI_PYTHON_CONFIG_HPP

#include <boost/mpi/config.hpp>

/*****************************************************************************
 *                                                                           *
 *  DLL import/export options                                                *  
 *                                                                           *
 *****************************************************************************/

#if defined(BOOST_HAS_DECLSPEC) && (defined(BOOST_MPI_PYTHON_DYN_LINK) || 
defined(BOOST_ALL_DYN_LINK)) && !defined(BOOST_MPI_PYTHON_STATIC_LINK)
#  if defined(BOOST_MPI_PYTHON_SOURCE)
#     define BOOST_MPI_PYTHON_DECL __declspec(dllexport)
#     define BOOST_MPI_PYTHON_BUILD_DLL
#  else
#     define BOOST_MPI_PYTHON_DECL __declspec(dllimport)
#  endif
#endif

#ifndef BOOST_MPI_PYTHON_DECL
#  define BOOST_MPI_PYTHON_DECL
#endif

#if !defined(BOOST_MPI_PYTHON_NO_LIB) && !defined(BOOST_MPI_PYTHON_SOURCE) && 
!defined(BOOST_ALL_NO_LIB)
#  define BOOST_LIB_NAME boost_mpi_python
#  if defined(BOOST_MPI_PYTHON_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)
#     define BOOST_DYN_LINK
#  endif
#  ifdef BOOST_MPI_PYTHON_DIAG
#     define BOOST_LIB_DIAGNOSTIC
#  endif
#  include <boost/config/auto_link.hpp>
#endif

#endif // BOOST_MPI_PYTHON_CONFIG_HPP

Index: serialize.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/mpi/python/serialize.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serialize.hpp       17 Jan 2007 02:48:47 -0000      1.1
+++ serialize.hpp       26 Jul 2007 16:11:00 -0000      1.2
@@ -20,6 +20,8 @@
 #ifndef BOOST_MPI_PYTHON_SERIALIZE_HPP
 #define BOOST_MPI_PYTHON_SERIALIZE_HPP
 
+#include <boost/mpi/python/config.hpp>
+
 #include <boost/python/object.hpp>
 #include <boost/python/str.hpp>
 #include <boost/python/extract.hpp>
@@ -86,7 +88,7 @@
 BOOST_PYTHON_SERIALIZATION_ARCHIVE(IArchiver, OArchiver)                \
 namespace boost { namespace python { namespace detail {                 \
 template<>                                                              \
-direct_serialization_table< IArchiver , OArchiver >&                    \
+BOOST_MPI_PYTHON_DECL direct_serialization_table< IArchiver , OArchiver >& \
  get_direct_serialization_table< IArchiver , OArchiver >();             \
 }                                                                       \
                                                                         \
@@ -113,7 +115,11 @@
  */
 #define BOOST_PYTHON_DIRECT_SERIALIZATION_ARCHIVE_IMPL(IArchiver, OArchiver) \
 namespace boost { namespace python { namespace detail {                 \
+template                                                                \
+  class BOOST_MPI_PYTHON_DECL direct_serialization_table< IArchiver , 
OArchiver >; \
+                                                                        \
 template<>                                                              \
+ BOOST_MPI_PYTHON_DECL                                                  \
  direct_serialization_table< IArchiver , OArchiver >&                   \
  get_direct_serialization_table< IArchiver , OArchiver >( )             \
 {                                                                       \
@@ -129,7 +135,7 @@
  *
  * Provides access to the Python "pickle" module from within C++.
  */
-class pickle {
+class BOOST_MPI_PYTHON_DECL pickle {
   struct data_t;
 
 public:
@@ -187,7 +193,7 @@
    * instead, use get_direct_serialization_table.
    */
   template<typename IArchiver, typename OArchiver>
-  class direct_serialization_table
+  class BOOST_MPI_PYTHON_DECL direct_serialization_table
   {
   public:
     typedef boost::function3<void, OArchiver&, const object&, const unsigned 
int>

Index: skeleton_and_content.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/mpi/python/skeleton_and_content.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- skeleton_and_content.hpp    17 Jan 2007 02:48:47 -0000      1.1
+++ skeleton_and_content.hpp    26 Jul 2007 16:11:00 -0000      1.2
@@ -83,7 +83,7 @@
   using boost::python::object;
   using boost::python::extract;
    
-  extern boost::python::object skeleton_proxy_base_type;
+  extern BOOST_MPI_DECL boost::python::object skeleton_proxy_base_type;
 
   template<typename T>
   struct skeleton_saver
@@ -150,14 +150,14 @@
    * Determine if a skeleton and content handler for @p type has
    * already been registered.
    */
-  bool
+  BOOST_MPI_PYTHON_DECL bool
   skeleton_and_content_handler_registered(PyTypeObject* type);
  
   /**
    * Register a skeleton/content handler with a particular Python type
    * (which actually wraps a C++ type).
    */
-  void 
+  BOOST_MPI_PYTHON_DECL void 
   register_skeleton_and_content_handler(PyTypeObject*, 
                                         const skeleton_content_handler&);
 } // end namespace detail


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs

Reply via email to