From 0b423b7006a45207849e22c86542a9661d1655c8 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 3 Nov 2004 11:54:18 +0000 Subject: [PATCH] fix link error (bug 1702) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@9159 a592a061-630c-0410-9148-cb99ea01b6c8 --- boost/ChangeLog | 4 ++++ boost/boost/format/feed_args.hpp | 3 +-- status.13x | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/boost/ChangeLog b/boost/ChangeLog index 7c47ac228f..4bfc98d971 100644 --- a/boost/ChangeLog +++ b/boost/ChangeLog @@ -1,3 +1,7 @@ +2004-11-03 Jean-Marc Lasgouttes + + * boost/format/feed_args.hpp: do not use a static string (bug 1702) + 2004-04-29 Jean-Marc Lasgouttes * boost/format/format_implementation.hpp: diff --git a/boost/boost/format/feed_args.hpp b/boost/boost/format/feed_args.hpp index eddc92a475..689529d3d3 100644 --- a/boost/boost/format/feed_args.hpp +++ b/boost/boost/format/feed_args.hpp @@ -34,8 +34,7 @@ namespace { template inline void empty_buf(BOOST_IO_STD basic_ostringstream & os) { - static const std::basic_string emptyStr; // avoids 2 cases ( "" and L"" ) - os.str(emptyStr); + os.str( std::basic_string() ); } template diff --git a/status.13x b/status.13x index fdd735fe97..36b60afe2b 100644 --- a/status.13x +++ b/status.13x @@ -46,3 +46,4 @@ What's new * Configuration/Installation: +- Fix link error with some compiler/os combinations [bug 1702]