diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-09-19 13:31:29 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-09-19 13:31:29 +0200 |
| commit | 8f3ba4e8708cb72be19dacc2af4f601ee5fea292 (patch) | |
| tree | f624675aa3d4add287f253e19eb28c0dce5669f1 /methods/http.h | |
| parent | c333ea435b67d7d7d7d10e867298ecac4da0f7b8 (diff) | |
| download | apt-8f3ba4e8708cb72be19dacc2af4f601ee5fea292.tar.gz | |
do not pollute namespace in the headers with using (Closes: #500198)
Diffstat (limited to 'methods/http.h')
| -rw-r--r-- | methods/http.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/methods/http.h b/methods/http.h index c47d7184a..08823d1b1 100644 --- a/methods/http.h +++ b/methods/http.h @@ -26,7 +26,7 @@ class CircleBuf unsigned long long Size; unsigned long long InP; unsigned long long OutP; - string OutQueue; + std::string OutQueue; unsigned long long StrPos; unsigned long long MaxGet; struct timeval Start; @@ -60,11 +60,11 @@ class CircleBuf // Read data in bool Read(int Fd); - bool Read(string Data); + bool Read(std::string Data); // Write data out bool Write(int Fd); - bool WriteTillEl(string &Data,bool Single = false); + bool WriteTillEl(std::string &Data,bool Single = false); // Control the write limit void Limit(long long Max) {if (Max == -1) MaxGet = 0-1; else MaxGet = OutP + Max;} @@ -99,7 +99,7 @@ struct ServerState enum {Chunked,Stream,Closes} Encoding; enum {Header, Data} State; bool Persistent; - string Location; + std::string Location; // This is a Persistent attribute of the server itself. bool Pipeline; @@ -112,7 +112,7 @@ struct ServerState int ServerFd; URI ServerName; - bool HeaderLine(string Line); + bool HeaderLine(std::string Line); bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;}; void Reset() {Major = 0; Minor = 0; Result = 0; Size = 0; StartPos = 0; Encoding = Closes; time(&Date); ServerFd = -1; @@ -167,10 +167,10 @@ class HttpMethod : public pkgAcqMethod /** \brief Try to AutoDetect the proxy */ bool AutoDetectProxy(); - virtual bool Configuration(string Message); + virtual bool Configuration(std::string Message); // In the event of a fatal signal this file will be closed and timestamped. - static string FailFile; + static std::string FailFile; static int FailFd; static time_t FailTime; static void SigTerm(int); @@ -178,8 +178,8 @@ class HttpMethod : public pkgAcqMethod protected: virtual bool Fetch(FetchItem *); - string NextURI; - string AutoDetectProxyCmd; + std::string NextURI; + std::string AutoDetectProxyCmd; public: friend struct ServerState; |