summaryrefslogtreecommitdiff
path: root/sql/sql_map.cc
diff options
context:
space:
mode:
authorsvoj@mysql.com <>2005-06-19 21:46:44 +0500
committersvoj@mysql.com <>2005-06-19 21:46:44 +0500
commit7660f609e6b92725d1975bf8016ddf7b600ee835 (patch)
treefda3bfa7da994908f408724b76f0f38f71920c13 /sql/sql_map.cc
parent4f966145b0ef059f3c9172b0aab5c9d1aa2257c2 (diff)
downloadmariadb-git-7660f609e6b92725d1975bf8016ddf7b600ee835.tar.gz
WL#2286 - Compile MySQL w/YASSL support
Fix for yaSSL link failures with Forte Developer 7, MIPSpro Compilers, Compaq C++. These compilers have problem with implicit template instantiation in archives (libyassl.a, libtaocrypt.a). Instantiate templates explicitly. Fix for yaSSL link failure on powermacg5 (gcc 3.3). When -O3 is specified gcc inlines __cxa_pure_virtual. This is wrong behavior, __cxa_pure_virtual must never be inlined.
Diffstat (limited to 'sql/sql_map.cc')
-rw-r--r--sql/sql_map.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_map.cc b/sql/sql_map.cc
index 9346f3df305..726bd48ab19 100644
--- a/sql/sql_map.cc
+++ b/sql/sql_map.cc
@@ -138,7 +138,7 @@ void unmap_file(mapped_files *map)
** Instansiate templates
*****************************************************************************/
-#ifdef __GNUC__
+#ifdef EXPLICIT_TEMPLATE_INSTANTIATION
/* Used templates */
template class I_List<mapped_files>;
template class I_List_iterator<mapped_files>;