| author | Andrew Ayer <agwa@andrewayer.name> | 2013-03-06 04:20:55 (UTC) |
|---|---|---|
| committer | Andrew Ayer <agwa@andrewayer.name> | 2013-03-22 17:07:14 (UTC) |
| commit | 5b6756787fb7005b98ad43fb875fbaa0d33a5e88 (patch) (side-by-side diff) | |
| tree | be8d117755bf43ef8ea1f8bc63a7338886a0f65a | |
| parent | 9c95375e56e9daca497999bde5cbc42e2fc553c2 (diff) | |
| download | libopkele-5b6756787fb7005b98ad43fb875fbaa0d33a5e88.zip libopkele-5b6756787fb7005b98ad43fb875fbaa0d33a5e88.tar.gz libopkele-5b6756787fb7005b98ad43fb875fbaa0d33a5e88.tar.bz2 | |
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.
| -rw-r--r-- | lib/curl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/curl.cc b/lib/curl.cc index 734e2ca..9d4064f 100644 --- a/lib/curl.cc +++ b/lib/curl.cc @@ -36,25 +36,25 @@ namespace opkele { curl_easy_cleanup(_c); _c = c; return *this; } CURLcode curl_t::misc_sets() { assert(_c); CURLcode r; (r=easy_setopt(CURLOPT_FOLLOWLOCATION,1)) || (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)) #endif #ifdef DISABLE_CURL_SSL_VERIFYPEER || (r=easy_setopt(CURLOPT_SSL_VERIFYPEER,0)) #endif ; return r; } static size_t _write(void *p,size_t s,size_t nm,void *stream) { |