From 19173e9584488f34983bbe32c60b327a0cfe9e9d Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Thu, 7 Jun 2012 12:49:55 +0200 Subject: [PATCH 1/2] some minor things (make win build warn free) --- examples/wsperf/stress_handler.cpp | 6 +++--- examples/wsperf/stress_handler.hpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/wsperf/stress_handler.cpp b/examples/wsperf/stress_handler.cpp index 0d49911b53..a2d6a501f3 100644 --- a/examples/wsperf/stress_handler.cpp +++ b/examples/wsperf/stress_handler.cpp @@ -79,7 +79,7 @@ stress_handler::stress_handler(wscmd::cmd& cmd) if (mode == "fixed") { m_msg_mode = msg_mode::FIXED; } else if (mode == "infinite") { - m_msg_mode = msg_mode::INFINITE; + m_msg_mode = msg_mode::UNLIMITED; } else { m_msg_mode = msg_mode::NONE; } @@ -91,7 +91,7 @@ stress_handler::stress_handler(wscmd::cmd& cmd) if (mode == "random") { m_con_lifetime = con_lifetime::RANDOM; } else if (mode == "infinite") { - m_con_lifetime = con_lifetime::INFINITE; + m_con_lifetime = con_lifetime::UNLIMITED; } else { m_con_lifetime = con_lifetime::FIXED; } @@ -278,7 +278,7 @@ bool stress_handler::maintenance() { } boost::chrono::nanoseconds dur = now - data.on_open; - size_t milliseconds = dur.count() / 1000000.; + size_t milliseconds = static_cast (dur.count() / 1000000.); if (milliseconds > m_con_duration) { close(con); diff --git a/examples/wsperf/stress_handler.hpp b/examples/wsperf/stress_handler.hpp index dc0dcd5658..e13344e1c3 100644 --- a/examples/wsperf/stress_handler.hpp +++ b/examples/wsperf/stress_handler.hpp @@ -46,7 +46,7 @@ namespace con_lifetime { enum value { FIXED = 0, RANDOM = 1, - INFINITE = 2 + UNLIMITED = 2 }; } @@ -56,7 +56,7 @@ namespace msg_mode { enum value { NONE = 0, FIXED = 1, - INFINITE = 2 + UNLIMITED = 2 }; } From 9838895d39329be35593debb35e2351bcd20e52b Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Thu, 7 Jun 2012 12:55:07 +0200 Subject: [PATCH 2/2] slight adjust --- examples/wsperf/stress_handler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/wsperf/stress_handler.cpp b/examples/wsperf/stress_handler.cpp index a2d6a501f3..cf49111ee6 100644 --- a/examples/wsperf/stress_handler.cpp +++ b/examples/wsperf/stress_handler.cpp @@ -278,7 +278,7 @@ bool stress_handler::maintenance() { } boost::chrono::nanoseconds dur = now - data.on_open; - size_t milliseconds = static_cast (dur.count() / 1000000.); + size_t milliseconds = static_cast(dur.count()) / 1000000; if (milliseconds > m_con_duration) { close(con);