diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2013-07-16 14:07:11 -0700 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2013-07-16 14:07:11 -0700 |
| commit | 6a7de2b21f0fe12ac2f22ed278488e047df93f77 (patch) | |
| tree | e143c70341417a9f49d7416f7d56247101b433c7 | |
| parent | e18fc80bc9b70928fb67d8cb314dafd5cd6d93b7 (diff) | |
| parent | 0003fc3131974e95de3951654a3493e7f5f2f969 (diff) | |
Merge pull request #589 from SaberUK/master+fix-debug-build
Fix some warnings which are causing debug builds to fail.
| -rw-r--r-- | include/modules/httpd.h | 2 | ||||
| -rw-r--r-- | src/configparser.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/modules/httpd.h b/include/modules/httpd.h index 3d94b3f42..86234d53f 100644 --- a/include/modules/httpd.h +++ b/include/modules/httpd.h @@ -185,11 +185,11 @@ class HTTPRequest : public Event */ class HTTPDocumentResponse { + public: /** Module that generated this reply */ Module* const module; - public: std::stringstream* document; unsigned int responsecode; diff --git a/src/configparser.cpp b/src/configparser.cpp index 31d314148..3289cf396 100644 --- a/src/configparser.cpp +++ b/src/configparser.cpp @@ -183,7 +183,10 @@ struct Parser std::set<std::string> seen; tag = ConfigTag::create(name, current.filename, current.line, items); - while (kv(items, seen)); + while (kv(items, seen)) + { + // Do nothing here (silences a GCC warning). + } if (name == mandatory_tag) { |