Skip to content

Commit 0be1218

Browse files
committed
fix linux build break 2
1 parent 0888409 commit 0be1218

File tree

7 files changed

+19
-14
lines changed

7 files changed

+19
-14
lines changed

Release/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ clean: DOUTPUT_DIR = $(PWD)/../Binaries/$(DMODE)
2929
export MODE
3030

3131
WARNINGS=-Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code
32-
SUPPRESSIONS=-Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-unused-function -Wno-char-subscripts -Wno-switch -Wno-unused-but-set-parameter -Wno-deprecated
32+
SUPPRESSIONS=-Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-unused-function -Wno-char-subscripts -Wno-switch -Wno-unused-but-set-parameter -Wno-deprecated -Wno-unused-value
3333

3434
# C++11 excludes GCC < 4.7, which is desired anyway
3535
OTHER_OPTIONS=-std=c++11 -fno-strict-aliasing

Release/include/producerconsumerstream.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ namespace Concurrency { namespace streams {
161161

162162
// Seeking is not supported
163163
virtual pos_type seekpos(pos_type, std::ios_base::openmode) { return (pos_type)traits::eof(); }
164-
virtual pos_type seekoff(off_type offset, std::ios_base::seekdir whre, std::ios_base::openmode mode) { return (pos_type)traits::eof(); }
164+
virtual pos_type seekoff(off_type , std::ios_base::seekdir , std::ios_base::openmode ) { return (pos_type)traits::eof(); }
165165

166166
/// <summary>
167167
/// Allocates a contiguous memory block and returns it.
@@ -230,7 +230,7 @@ namespace Concurrency { namespace streams {
230230

231231
// If the write head has been closed then have reached the end of the
232232
// stream (return true), otherwise more data could be written later (return false).
233-
return !can_write();
233+
return !this->can_write();
234234
}
235235
else
236236
{

Release/src/http/client/http_client.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ namespace web { namespace http
252252
protected:
253253

254254
request_context(std::shared_ptr<_http_client_communicator> client, http_request &request)
255-
: m_http_client(client), m_request(request), m_total_response_size(0), m_received_hdrs(false), m_exceptionPtr(nullptr)
255+
: m_http_client(client), m_request(request), m_total_response_size(0), m_received_hdrs(false), m_exceptionPtr()
256256
{
257257
auto responseImpl = m_response._get_impl();
258258

@@ -2446,7 +2446,7 @@ namespace web { namespace http
24462446

24472447
unsigned long open()
24482448
{
2449-
m_client.reset(new client(crossplat::threadpool::shared_instance().service(), config.chunksize()));
2449+
m_client.reset(new client(crossplat::threadpool::shared_instance().service(), client_config().chunksize()));
24502450
return 0;
24512451
}
24522452

Release/tests/Common/UnitTestpp/src/TestReporterStdout.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
#include "stdafx.h"
3333
#include <vector>
34+
#include <stdarg.h>
3435

3536
// cstdio doesn't pull in namespace std on VC6, so we do it here.
3637
#if defined(UNITTEST_WIN32) && (_MSC_VER == 1200)
@@ -55,7 +56,11 @@ static void PrintfWrapper(const char* format, ...)
5556
HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE);
5657
WriteFile(h, &byteArray[0], (DWORD)bufSize, &bytesWritten, NULL);
5758
#else
59+
#ifdef _MS_WINDOWS
5860
vfprintf_s(stdout, format, args);
61+
#else
62+
vfprintf(stdout, format, args);
63+
#endif
5964
#endif
6065

6166
va_end(args);

Release/tests/Functional/http/utilities/testlistener/include/http_listener.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ class http_listener : public http_listener_interface
201201
/// <param name="handler">A function object representing the pipeline stage.</param>
202202
void add_handler(std::function<pplx::task<http_response>(http_request, std::shared_ptr<http::http_pipeline_stage>)> handler)
203203
{
204-
m_pipeline->append(std::make_shared<::web::http::details::function_pipeline_wrapper>(handler));
204+
m_pipeline->append(std::make_shared< ::web::http::details::function_pipeline_wrapper>(handler));
205205
}
206206

207207
/// <summary>
@@ -292,7 +292,7 @@ class http_listener : public http_listener_interface
292292
this->m_supported_methods = std::move(other.m_supported_methods);
293293
this->m_pipeline = std::move(other.m_pipeline);
294294

295-
std::shared_ptr<::web::http::http_pipeline_stage> lastStage = this->m_pipeline->last_stage();
295+
std::shared_ptr< ::web::http::http_pipeline_stage> lastStage = this->m_pipeline->last_stage();
296296
auto listenerStage = static_cast<_listener_stage *>(lastStage.get());
297297
listenerStage->reset_listener(this);
298298

@@ -340,4 +340,4 @@ class http_listener : public http_listener_interface
340340
} // namespace http
341341
} // namespace web
342342

343-
#endif /* _CASA_HTTP_LISTENER_H */
343+
#endif /* _CASA_HTTP_LISTENER_H */

Release/tests/Functional/http/utilities/testlistener/src/listener/http_linux_server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ void connection::handle_headers()
208208

209209
Concurrency::streams::producer_consumer_buffer<uint8_t> buf;
210210
m_request._get_impl()->set_instream(buf.create_istream());
211-
m_request._get_impl()->set_outstream(buf.create_ostream());
211+
m_request._get_impl()->set_outstream(buf.create_ostream(), false);
212212
if (m_chunked)
213213
{
214214
boost::asio::async_read_until(*m_socket, m_request_buf, CRLF, boost::bind(&connection::handle_chunked_header, this, placeholders::error));

Release/tests/Functional/http/utilities/testlistener/src/logging/log.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ using namespace utility;
3838
using namespace logging;
3939
using namespace pplx;
4040

41-
std::shared_ptr<::logging::_Log> s_default;
41+
std::shared_ptr< ::logging::_Log> s_default;
4242

4343
void log::post(log_level level, const utility::string_t &message)
4444
{
@@ -64,21 +64,21 @@ void log::set_default(_Inout_opt_ ::logging::_Log *log)
6464
{
6565
if ( log == nullptr )
6666
log = new logging::_details::SilentLog;
67-
s_default = std::shared_ptr<::logging::_Log>(log);
67+
s_default = std::shared_ptr< ::logging::_Log>(log);
6868
}
6969

70-
void log::set_default(std::shared_ptr<::logging::_Log> log)
70+
void log::set_default(std::shared_ptr< ::logging::_Log> log)
7171
{
7272
if ( !log )
7373
log = std::make_shared<logging::_details::SilentLog>();
7474
s_default = log;
7575
}
7676

77-
std::shared_ptr<::logging::_Log> log::get_default()
77+
std::shared_ptr< ::logging::_Log> log::get_default()
7878
{
7979
if ( !s_default )
8080
{
81-
s_default = std::shared_ptr<::logging::_Log>(new logging::_details::ConsoleLog(true, true));
81+
s_default = std::shared_ptr< ::logging::_Log>(new logging::_details::ConsoleLog(true, true));
8282
}
8383
return s_default;
8484
}

0 commit comments

Comments
 (0)