X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fkeys.hpp;h=1034a672b0798b522e9c4baee5210e8e41c9a48e;hb=a20205ad8b1a30fbc419e016a633b40b739073c7;hp=11b7c061f664cd14b55e25f9b5d6a34948ee68f7;hpb=7a7a973ec64019907188c581b1d1d028dca172b9;p=m6w6%2Flibmemcached diff --git a/tests/keys.hpp b/tests/keys.hpp index 11b7c061..1034a672 100644 --- a/tests/keys.hpp +++ b/tests/keys.hpp @@ -2,7 +2,7 @@ * * Libmemcached library * - * Copyright (C) 2012 Data Differential, http://datadifferential.com/ + * Copyright (C) 2012-2013 Data Differential, http://datadifferential.com/ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -62,18 +62,18 @@ public: key_buffer.resize(padding +1); memset(&key_buffer[0], 'x', padding); +#if defined(HAVE_UUID_UUID_H) && HAVE_UUID_UUID_H if (HAVE_UUID_UUID_H) { -#if defined(HAVE_UUID_UUID_H) && HAVE_UUID_UUID_H uuid_t out; uuid_generate(out); uuid_unparse(out, &key_buffer[0]); _keys[x]= strdup(&key_buffer[0]); (_keys[x])[UUID_STRING_MAXLENGTH]= 'x'; -#endif } else // We just use a number and pad the string if UUID is not available +#endif { char int_buffer[MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1]; int key_length= snprintf(int_buffer, sizeof(int_buffer), "%u", uint32_t(x));