ZNC: Update to 0.098 and minor fixes
[openwrt/svn-archive/archive.git] / net / znc / patches / 002-Uclibcpp_build_fix.patch
1 From fa14938321eda39f16bee6068296e6abc9df7b85 Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
3 Date: Wed, 6 Apr 2011 04:11:48 +0200
4 Subject: [PATCH] Add a uClibc++ build workaround
5
6 ---
7 modules/webadmin.cpp | 4 +++-
8 1 files changed, 3 insertions(+), 1 deletions(-)
9
10 --- a/modules/webadmin.cpp
11 +++ b/modules/webadmin.cpp
12 @@ -15,11 +15,13 @@
13 #include "WebModules.h"
14 #include "ZNCString.h"
15 #include "Listener.h"
16 +#include <string>
17 #include <sstream>
18 #include <utility>
19
20 using std::stringstream;
21 using std::make_pair;
22 +using std::string;
23
24 /* Stuff to be able to write this:
25 // i will be name of local variable, see below
26 @@ -58,7 +60,7 @@ class CWebAdminMod : public CGlobalModul
27 public:
28 GLOBALMODCONSTRUCTOR(CWebAdminMod) {
29 VPair vParams;
30 - vParams.push_back(make_pair("user", ""));
31 + vParams.push_back(make_pair((string)"user", (string)""));
32 AddSubPage(new CWebSubPage("settings", "Global Settings", CWebSubPage::F_ADMIN));
33 AddSubPage(new CWebSubPage("edituser", "Your Settings", vParams));
34 AddSubPage(new CWebSubPage("traffic", "Traffic Info", CWebSubPage::F_ADMIN));