Merge in conversion to C++.

[awesomized/libmemcached] / libmemcached / options / context.h

diff --git a/libmemcached/options/context.h b/libmemcached/options/context.h
index bbca66c855e23600646de64c627a585c8f8b5e39..226284d960ded8664d1105959a676f2f63a7a27a 100644 (file)
--- a/libmemcached/options/context.h
+++ b/libmemcached/options/context.h
@@ -90,7 +90,7 @@ public:
 
   const char *set_hostname(const char *str, size_t size)
   {
-    size_t copy_length= std::min((size_t)NI_MAXHOST, size);
+    size_t copy_length= (size_t)NI_MAXHOST > size ? size : (size_t)NI_MAXHOST;
     memcpy(_hostname, str, copy_length);
     _hostname[copy_length]= 0;