Skip to content

Commit 7f5103e

Browse files
committed
Fixing error from prior merge conflict.
1 parent faacb7b commit 7f5103e

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

Release/include/cpprest/astreambuf.h

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -114,28 +114,6 @@ namespace streams
114114
{
115115
return reinterpret_cast<unsigned char*>(std::char_traits<char>::move(reinterpret_cast<char*>(left), reinterpret_cast<const char*>(right), n));
116116
}
117-
118-
namespace Concurrency
119-
{
120-
/// Library for asynchronous streams.
121-
namespace streams
122-
{
123-
/// <summary>
124-
/// Extending the standard char_traits type with one that adds values and types
125-
/// that are unique to "C++ REST SDK" streams.
126-
/// </summary>
127-
/// <typeparam name="_CharType">
128-
/// The data type of the basic element of the stream.
129-
/// </typeparam>
130-
template<typename _CharType>
131-
struct char_traits : std::char_traits<_CharType>
132-
{
133-
/// <summary>
134-
/// Some synchronous functions will return this value if the operation
135-
/// requires an asynchronous call in a given situation.
136-
/// </summary>
137-
/// <returns>An <c>int_type</c> value which implies that an asynchronous call is required.</returns>
138-
static typename std::char_traits<_CharType>::int_type requires_async() { return std::char_traits<_CharType>::eof()-1; }
139117
};
140118
#endif
141119

0 commit comments

Comments
 (0)