To comment on the following update, log in, then open the issue:
http://www.openoffice.org/issues/show_bug.cgi?id=82715
User cmc changed the following:
What |Old value |New value
================================================================================
IssuesThisDependsOn| |72150
--------------------------------------------------------------------------------
------- Additional comments from [EMAIL PROTECTED] Sat Oct 20 23:34:15 +0000
2007 -------
Nah, this is just two patches mismerging incorrectly, your configure.in with the
two patches together is now...
if test "$USE_SYSTEM_STL" = "YES"; then
AC_MSG_CHECKING([if hash_map will be in __gnu_cxx namespace])
AC_LANG_PUSH([C++])
AC_TRY_COMPILE([#include <ext/hash_map>
using namespace __gnu_cxx;
],[hash_map<int, int> t; return 0;],
ac_cv_cxx_have_ext_hash_map=yes, ac_cv_cxx_have_ext_hash_map=no)
AC_LANG_POP([C++])
if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then
AC_MSG_ERROR([Can't find hash_map. Try with stlport enabled])
else
AC_MSG_RESULT([$ac_cv_cxx_have_ext_hash_map])
fi
if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
AC_MSG_CHECKING([if STL headers are visibility safe])
AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
AC_MSG_RESULT([$stlvisok])
if test "$stlvisok" = "no"; then
AC_MSG_ERROR([Your gcc STL headers are not visibility safe. Try with
--with-stlport4])
fi
fi
fi
it needs to be
if test "$USE_SYSTEM_STL" = "YES"; then
AC_MSG_CHECKING([if hash_map will be in __gnu_cxx namespace])
AC_LANG_PUSH([C++])
AC_TRY_COMPILE([#include <ext/hash_map>
using namespace __gnu_cxx;
],[hash_map<int, int> t; return 0;],
ac_cv_cxx_have_ext_hash_map=yes, ac_cv_cxx_have_ext_hash_map=no)
if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then
AC_MSG_ERROR([Can't find hash_map. Try with stlport enabled])
else
AC_MSG_RESULT([$ac_cv_cxx_have_ext_hash_map])
fi
if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
AC_MSG_CHECKING([if STL headers are visibility safe])
AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
AC_MSG_RESULT([$stlvisok])
if test "$stlvisok" = "no"; then
AC_MSG_ERROR([Your gcc STL headers are not visibility safe. Try with
--with-stlport4])
fi
fi
AC_LANG_POP([C++])
fi
i.e. the LANG_POP needs to be *after* the AC_EGREP_HEADER not *before*, just a
side-effect of issue 72150 fixing that it is C outside push/pop pairs and C++
inside them, while this patch also wants to modify the same rough area. I'll
mark this a dependent on the other so it won't happen when if we do apply this.
---------------------------------------------------------------------
Please do not reply to this automatically generated notification from
Issue Tracker. Please log onto the website and enter your comments.
http://qa.openoffice.org/issue_handling/project_issues.html#notification
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
