From 229ba91523794b85ce4a4883a975f63c80252b77 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 10 Dec 2009 14:38:36 +0200
Subject: Export type maps in GCC 4.x using the visibility attribute

---
 xsd/cxx/tree/stream-extraction-source.cxx | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'xsd/cxx/tree/stream-extraction-source.cxx')

diff --git a/xsd/cxx/tree/stream-extraction-source.cxx b/xsd/cxx/tree/stream-extraction-source.cxx
index 14920e0..97034a8 100644
--- a/xsd/cxx/tree/stream-extraction-source.cxx
+++ b/xsd/cxx/tree/stream-extraction-source.cxx
@@ -679,9 +679,7 @@ namespace CXX
 
         if (import_maps || export_maps)
         {
-          ctx.os << "#ifdef _MSC_VER" << endl
-                 << endl
-                 << "namespace xsd"
+          ctx.os << "namespace xsd"
                  << "{"
                  << "namespace cxx"
                  << "{"
@@ -692,6 +690,8 @@ namespace CXX
           {
             String stream (*i);
 
+            ctx.os << "#ifdef _MSC_VER" << endl;
+
             if (export_maps)
               ctx.os << "template struct __declspec (dllexport) " <<
                 "stream_extraction_plate< 0, " << stream << ", " <<
@@ -701,13 +701,17 @@ namespace CXX
               ctx.os << "template struct __declspec (dllimport) " <<
                 "stream_extraction_plate< 0, " << stream << ", " <<
                 ctx.char_type << " >;";
+
+            ctx.os << "#elif defined(__GNUC__) && __GNUC__ >= 4" << endl
+                   << "template struct __attribute__ ((visibility(\"default\"))) " <<
+              "stream_extraction_plate< 0, " << stream << ", " <<
+              ctx.char_type << " >;"
+                   << "#endif" << endl;
           }
 
-          ctx.os << "}" // tree
-                 << "}" // cxx
-                 << "}" // xsd
-                 << "#endif // _MSC_VER" << endl
-                 << endl;
+          ctx.os << "}"  // tree
+                 << "}"  // cxx
+                 << "}"; // xsd
         }
 
         ctx.os << "namespace _xsd"
-- 
cgit v1.1