Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

non-syncronized shift operators have been removed #1291

Merged
merged 1 commit into from Oct 25, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion hpx/components/iostreams/ostream.hpp
Expand Up @@ -93,6 +93,8 @@ namespace hpx { namespace iostreams
private:
typedef components::client_base<ostream, stubs::output_stream> base_type;
typedef detail::ostream_creator<char>::stream_type stream_base_type;
typedef stream_base_type::traits_type stream_traits_type;
typedef BOOST_IOSTREAMS_BASIC_OSTREAM(char, stream_traits_type) std_stream_type;
typedef detail::ostream_creator<char>::iterator_type iterator_type;
typedef lcos::local::recursive_mutex mutex_type;

Expand Down Expand Up @@ -250,7 +252,12 @@ namespace hpx { namespace iostreams
return streaming_operator_lazy(subject);
}

using stream_base_type::operator<<;
///////////////////////////////////////////////////////////////////////
ostream& operator<<(std_stream_type& (*manip_fun)(std_stream_type&))
{
mutex_type::scoped_lock l(mtx_);
return streaming_operator_lazy(manip_fun);
}
};

///////////////////////////////////////////////////////////////////////////
Expand Down