From f3af4d1a4ec39764e16ba79cdf205a5fa57ddb00 Mon Sep 17 00:00:00 2001
From: Jeremiah Willcock <jewillco@osl.iu.edu>
Date: Sun, 6 Dec 2009 03:51:08 +0000
Subject: [PATCH] Factored out declspec code; added BOOST_GRAPH_SOURCE where
 necessary

[SVN r58179]
---
 include/boost/graph/dll_import_export.hpp | 30 +++++++++++++++++++++++
 include/boost/graph/graphml.hpp           |  1 +
 include/boost/graph/graphviz.hpp          | 15 +-----------
 src/graphml.cpp                           |  2 ++
 src/read_graphviz_new.cpp                 |  2 ++
 5 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 include/boost/graph/dll_import_export.hpp

diff --git a/include/boost/graph/dll_import_export.hpp b/include/boost/graph/dll_import_export.hpp
new file mode 100644
index 00000000..cc369d1d
--- /dev/null
+++ b/include/boost/graph/dll_import_export.hpp
@@ -0,0 +1,30 @@
+//=======================================================================
+// Copyright 2001 University of Notre Dame.
+// Copyright 2003 Jeremy Siek
+// Authors: Lie-Quan Lee, Jeremy Siek, and Douglas Gregor
+//
+// Distributed under 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)
+//=======================================================================
+
+#ifndef BOOST_GRAPH_DLL_IMPORT_EXPORT_HPP
+#define BOOST_GRAPH_DLL_IMPORT_EXPORT_HPP
+
+#include <boost/config.hpp>
+
+#ifdef BOOST_HAS_DECLSPEC
+#  if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_GRAPH_DYN_LINK)
+#    ifdef BOOST_GRAPH_SOURCE
+#      define BOOST_GRAPH_DECL __declspec(dllexport)
+#    else
+#      define BOOST_GRAPH_DECL __declspec(dllimport)
+#    endif  // BOOST_GRAPH_SOURCE
+#  endif  // DYN_LINK
+#endif  // BOOST_HAS_DECLSPEC
+
+#ifndef BOOST_GRAPH_DECL
+#  define BOOST_GRAPH_DECL
+#endif
+
+#endif // BOOST_GRAPH_DLL_IMPORT_EXPORT_HPP
diff --git a/include/boost/graph/graphml.hpp b/include/boost/graph/graphml.hpp
index f6256a0f..c5d87c7f 100644
--- a/include/boost/graph/graphml.hpp
+++ b/include/boost/graph/graphml.hpp
@@ -16,6 +16,7 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/any.hpp>
 #include <boost/type_traits/is_convertible.hpp>
+#include <boost/graph/dll_import_export.hpp>
 #include <boost/graph/graphviz.hpp> // for exceptions
 #include <typeinfo>
 #include <boost/mpl/bool.hpp>
diff --git a/include/boost/graph/graphviz.hpp b/include/boost/graph/graphviz.hpp
index c1f87375..52f3468a 100644
--- a/include/boost/graph/graphviz.hpp
+++ b/include/boost/graph/graphviz.hpp
@@ -24,20 +24,7 @@
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/property_map/dynamic_property_map.hpp>
 #include <boost/graph/overloading.hpp>
-
-#ifdef BOOST_HAS_DECLSPEC
-#  if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_GRAPH_DYN_LINK)
-#    ifdef BOOST_GRAPH_SOURCE
-#      define BOOST_GRAPH_DECL __declspec(dllexport)
-#    else
-#      define BOOST_GRAPH_DECL __declspec(dllimport)
-#    endif  // BOOST_GRAPH_SOURCE
-#  endif  // DYN_LINK
-#endif  // BOOST_HAS_DECLSPEC
-
-#ifndef BOOST_GRAPH_DECL
-#  define BOOST_GRAPH_DECL
-#endif
+#include <boost/graph/dll_import_export.hpp>
 
 namespace boost {
 
diff --git a/src/graphml.cpp b/src/graphml.cpp
index 8ed56e91..300b65fa 100644
--- a/src/graphml.cpp
+++ b/src/graphml.cpp
@@ -10,9 +10,11 @@
 //           Andrew Lumsdaine
 //           Tiago de Paula Peixoto
 
+#define BOOST_GRAPH_SOURCE
 #include <boost/foreach.hpp>
 #include <boost/optional.hpp>
 #include <boost/graph/graphml.hpp>
+#include <boost/graph/dll_import_export.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 
diff --git a/src/read_graphviz_new.cpp b/src/read_graphviz_new.cpp
index 6f3302b4..08887a58 100644
--- a/src/read_graphviz_new.cpp
+++ b/src/read_graphviz_new.cpp
@@ -25,6 +25,7 @@
 //         Ronald Garcia
 //
 
+#define BOOST_GRAPH_SOURCE
 #include <boost/ref.hpp>
 #include <boost/function/function2.hpp>
 #include <boost/property_map/dynamic_property_map.hpp>
@@ -44,6 +45,7 @@
 #include <boost/regex.hpp>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
+#include <boost/graph/dll_import_export.hpp>
 #include <boost/graph/graphviz.hpp>
 
 namespace boost {