summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--reportdesign/source/ui/dlg/Formula.cxx10
-rw-r--r--sc/source/ui/formdlg/formula.cxx4
2 files changed, 11 insertions, 3 deletions
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index abbed45b6655..cd92312151c8 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -258,9 +258,13 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pArray->Fill(_aTokenList, NULL);
return pArray;
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
-// =============================================================================
+
} // rptui
-// =============================================================================
+
+// for mysterious reasons Apple llvm-g++ 4.2.1 needs these explicit
+// template instantiations; otherwise linking fails with unresolved symbols
+template class ::std::auto_ptr<formula::FormulaTokenArray>;
+template std::auto_ptr<formula::FormulaTokenArray>::operator std::auto_ptr_ref<formula::FormulaTokenArray>();
+SAL_WNODEPRECATED_DECLARATIONS_POP
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 55897bfbfd77..84413a5e61ee 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -659,6 +659,10 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pArray->Fill( _aTokenList, pDoc->GetExternalRefManager());
return pArray;
}
+// for mysterious reasons Apple llvm-g++ 4.2.1 needs these explicit
+// template instantiations; otherwise linking fails with unresolved symbols
+template class ::std::auto_ptr<formula::FormulaTokenArray>;
+template std::auto_ptr<formula::FormulaTokenArray>::operator std::auto_ptr_ref<formula::FormulaTokenArray>();
SAL_WNODEPRECATED_DECLARATIONS_POP
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */