summaryrefslogtreecommitdiffabout
authorAndrew Ayer <agwa@andrewayer.name>2013-03-06 04:20:55 (UTC)
committer Andrew Ayer <agwa@andrewayer.name>2013-03-22 17:07:14 (UTC)
commit5b6756787fb7005b98ad43fb875fbaa0d33a5e88 (patch) (unidiff)
treebe8d117755bf43ef8ea1f8bc63a7338886a0f65a
parent9c95375e56e9daca497999bde5cbc42e2fc553c2 (diff)
downloadlibopkele-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/curl.cc2
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
@@ -1,99 +1,99 @@
1#include <opkele/exception.h> 1#include <opkele/exception.h>
2#include <opkele/curl.h> 2#include <opkele/curl.h>
3 3
4#include "config.h" 4#include "config.h"
5 5
6namespace opkele { 6namespace opkele {
7 7
8 namespace util { 8 namespace util {
9 9
10 curl_slist_t::~curl_slist_t() throw() { 10 curl_slist_t::~curl_slist_t() throw() {
11 if(_s) 11 if(_s)
12 curl_slist_free_all(_s); 12 curl_slist_free_all(_s);
13 } 13 }
14 14
15 curl_slist_t& curl_slist_t::operator=(curl_slist *s) { 15 curl_slist_t& curl_slist_t::operator=(curl_slist *s) {
16 if(_s) 16 if(_s)
17 curl_slist_free_all(_s); 17 curl_slist_free_all(_s);
18 _s = s; 18 _s = s;
19 return *this; 19 return *this;
20 } 20 }
21 21
22 void curl_slist_t::append(const char *str) { 22 void curl_slist_t::append(const char *str) {
23 curl_slist *s = curl_slist_append(_s,str); 23 curl_slist *s = curl_slist_append(_s,str);
24 if(!s) 24 if(!s)
25 throw opkele::exception(OPKELE_CP_ "failed to curl_slist_append()"); 25 throw opkele::exception(OPKELE_CP_ "failed to curl_slist_append()");
26 _s=s; 26 _s=s;
27 } 27 }
28 28
29 curl_t::~curl_t() throw() { 29 curl_t::~curl_t() throw() {
30 if(_c) 30 if(_c)
31 curl_easy_cleanup(_c); 31 curl_easy_cleanup(_c);
32 } 32 }
33 33
34 curl_t& curl_t::operator=(CURL *c) { 34 curl_t& curl_t::operator=(CURL *c) {
35 if(_c) 35 if(_c)
36 curl_easy_cleanup(_c); 36 curl_easy_cleanup(_c);
37 _c = c; 37 _c = c;
38 return *this; 38 return *this;
39 } 39 }
40 40
41 CURLcode curl_t::misc_sets() { 41 CURLcode curl_t::misc_sets() {
42 assert(_c); 42 assert(_c);
43 CURLcode r; 43 CURLcode r;
44 (r=easy_setopt(CURLOPT_FOLLOWLOCATION,1)) 44 (r=easy_setopt(CURLOPT_FOLLOWLOCATION,1))
45 || (r=easy_setopt(CURLOPT_MAXREDIRS,5)) 45 || (r=easy_setopt(CURLOPT_MAXREDIRS,5))
46 || (r=easy_setopt(CURLOPT_DNS_CACHE_TIMEOUT,120)) 46 || (r=easy_setopt(CURLOPT_DNS_CACHE_TIMEOUT,120))
47 || (r=easy_setopt(CURLOPT_DNS_USE_GLOBAL_CACHE,1)) 47 || (r=easy_setopt(CURLOPT_DNS_USE_GLOBAL_CACHE,1))
48 || (r=easy_setopt(CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_SRC_VERSION)) 48 || (r=easy_setopt(CURLOPT_USERAGENT,PACKAGE_NAME "/" PACKAGE_SRC_VERSION))
49 || (r=easy_setopt(CURLOPT_TIMEOUT,20)) 49 || (r=easy_setopt(CURLOPT_TIMEOUT,20))
50 #ifdefDISABLE_CURL_SSL_VERIFYHOST 50 #ifdefDISABLE_CURL_SSL_VERIFYHOST
51 || (r=easy_setopt(CURLOPT_SSL_VERIFYHOST,0)) 51 || (r=easy_setopt(CURLOPT_SSL_VERIFYHOST,0))
52#endif 52#endif
53 #ifdefDISABLE_CURL_SSL_VERIFYPEER 53 #ifdefDISABLE_CURL_SSL_VERIFYPEER
54 || (r=easy_setopt(CURLOPT_SSL_VERIFYPEER,0)) 54 || (r=easy_setopt(CURLOPT_SSL_VERIFYPEER,0))
55#endif 55#endif
56 ; 56 ;
57 return r; 57 return r;
58 } 58 }
59 59
60 static size_t _write(void *p,size_t s,size_t nm,void *stream) { 60 static size_t _write(void *p,size_t s,size_t nm,void *stream) {
61 return ((curl_t*)stream)->write(p,s,nm); 61 return ((curl_t*)stream)->write(p,s,nm);
62 } 62 }
63 63
64 CURLcode curl_t::set_write() { 64 CURLcode curl_t::set_write() {
65 assert(_c); 65 assert(_c);
66 CURLcode r; 66 CURLcode r;
67 (r = easy_setopt(CURLOPT_WRITEDATA,this)) 67 (r = easy_setopt(CURLOPT_WRITEDATA,this))
68 || (r = easy_setopt(CURLOPT_WRITEFUNCTION,_write)); 68 || (r = easy_setopt(CURLOPT_WRITEFUNCTION,_write));
69 return r; 69 return r;
70 } 70 }
71 71
72 static int _progress(void *cp,double dlt,double dln,double ult,double uln) { 72 static int _progress(void *cp,double dlt,double dln,double ult,double uln) {
73 return ((curl_t*)cp)->progress(dlt,dln,ult,uln); 73 return ((curl_t*)cp)->progress(dlt,dln,ult,uln);
74 } 74 }
75 75
76 CURLcode curl_t::set_progress() { 76 CURLcode curl_t::set_progress() {
77 assert(_c); 77 assert(_c);
78 CURLcode r; 78 CURLcode r;
79 (r = easy_setopt(CURLOPT_PROGRESSDATA,this)) 79 (r = easy_setopt(CURLOPT_PROGRESSDATA,this))
80 || (r = easy_setopt(CURLOPT_PROGRESSFUNCTION,_progress)) 80 || (r = easy_setopt(CURLOPT_PROGRESSFUNCTION,_progress))
81 || (r = easy_setopt(CURLOPT_NOPROGRESS,0)); 81 || (r = easy_setopt(CURLOPT_NOPROGRESS,0));
82 return r; 82 return r;
83 } 83 }
84 84
85 static size_t _header(void *p,size_t s,size_t nm,void *stream) { 85 static size_t _header(void *p,size_t s,size_t nm,void *stream) {
86 return ((curl_t*)stream)->header(p,s,nm); 86 return ((curl_t*)stream)->header(p,s,nm);
87 } 87 }
88 88
89 CURLcode curl_t::set_header() { 89 CURLcode curl_t::set_header() {
90 assert(_c); 90 assert(_c);
91 CURLcode r; 91 CURLcode r;
92 (r = easy_setopt(CURLOPT_HEADERDATA,this)) 92 (r = easy_setopt(CURLOPT_HEADERDATA,this))
93 || (r=easy_setopt(CURLOPT_HEADERFUNCTION,_header)); 93 || (r=easy_setopt(CURLOPT_HEADERFUNCTION,_header));
94 return r; 94 return r;
95 } 95 }
96 96
97 } 97 }
98 98
99} 99}