fix ambiguity with snprintf

arvidn · Sep 21, 2015 · 3959f63 · 3959f63
1 parent 6fcfc84
commit 3959f63
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/include/simulator/simulator.hpp b/include/simulator/simulator.hpp
@@ -31,7 +31,7 @@ All rights reserved.
 #include <stdio.h>
 #include <stdarg.h>
 
-namespace sim {
+namespace sim { namespace aux {
 inline int snprintf(char* buf, int len, char const* fmt, ...)
 {
 	va_list lp;
@@ -42,7 +42,7 @@ inline int snprintf(char* buf, int len, char const* fmt, ...)
 	if (ret < 0) { buf[len-1] = 0; ret = len-1; }
 	return ret;
 }
-}
+}}
 #endif
 
 #if defined BOOST_ASIO_HAS_STD_CHRONO

diff --git a/src/http_server.cpp b/src/http_server.cpp
@@ -29,6 +29,8 @@ using boost::system::error_code;
 
 namespace sim
 {
+	using namespace aux;
+
 	std::string send_response(int code, char const* status_message
 		, int len, char const** extra_header)
 	{

diff --git a/src/queue.cpp b/src/queue.cpp
@@ -24,6 +24,8 @@ typedef sim::chrono::high_resolution_clock::duration duration;
 
 namespace sim
 {
+	using namespace aux;
+
 	queue::queue(asio::io_service& ios
 		, int bandwidth
 		, chrono::high_resolution_clock::duration propagation_delay