From 5b6756787fb7005b98ad43fb875fbaa0d33a5e88 Mon Sep 17 00:00:00 2001 From: Andrew Ayer Date: Wed, 06 Mar 2013 04:20:55 +0000 Subject: Fix ambiguity with C++11 user-defined literals By adding whitespace around the macros, we make it clear that we mean to concatenate the string literals, not use a C++11 user-defined literal. See http://gcc.gnu.org/gcc-4.7/porting_to.html, section "User-defined literals and whitespace." This is necessary to compile libopkele with C++11 enabled. --- diff --git a/lib/curl.cc b/lib/curl.cc index 734e2ca..9d4064f 100644 --- a/lib/curl.cc +++ b/lib/curl.cc @@ -45,7 +45,7 @@ namespace opkele { || (r=easy_setopt(CURLOPT_MAXREDIRS,5)) || (r=easy_setopt(CURLOPT_DNS_CACHE_TIMEOUT,120)) || (r=easy_setopt(CURLOPT_DNS_USE_GLOBAL_CACHE,1)) - || (r=easy_setopt(CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_SRC_VERSION)) + || (r=easy_setopt(CURLOPT_USERAGENT,PACKAGE_NAME "/" PACKAGE_SRC_VERSION)) || (r=easy_setopt(CURLOPT_TIMEOUT,20)) #ifdef DISABLE_CURL_SSL_VERIFYHOST || (r=easy_setopt(CURLOPT_SSL_VERIFYHOST,0)) -- cgit v0.9.0.2