Fixing another merge issue.

stgates · stgates · commit 24aea539b565 · 2014-11-07T11:38:05.000-08:00
diff --git a/Release/include/cpprest/astreambuf.h b/Release/include/cpprest/astreambuf.h
@@ -114,6 +114,8 @@ namespace streams
         {
             return reinterpret_cast<unsigned char*>(std::char_traits<char>::move(reinterpret_cast<char*>(left), reinterpret_cast<const char*>(right), n));
         }
+
+        static int_type requires_async() { return eof() - 1; }
     };
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,8 @@ namespace streams`
`114`	`114`	`{`
`115`	`115`	`return reinterpret_cast<unsigned char>(std::char_traits<char>::move(reinterpret_cast<char>(left), reinterpret_cast<const char*>(right), n));`
`116`	`116`	`}`
	`117`	`+`
	`118`	`+ static int_type requires_async() { return eof() - 1; }`
`117`	`119`	`};`
`118`	`120`	`#endif`
`119`	`121`