a9c65a441f
git-svn-id: svn://svn.openwrt.org/openwrt/packages@29875 3c298f89-4303-0410-b956-a3cf2f4a3e73
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From fa14938321eda39f16bee6068296e6abc9df7b85 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
|
|
Date: Wed, 6 Apr 2011 04:11:48 +0200
|
|
Subject: [PATCH] Add a uClibc++ build workaround
|
|
|
|
---
|
|
modules/webadmin.cpp | 4 +++-
|
|
1 files changed, 3 insertions(+), 1 deletions(-)
|
|
|
|
--- a/modules/webadmin.cpp
|
|
+++ b/modules/webadmin.cpp
|
|
@@ -15,11 +15,13 @@
|
|
#include "WebModules.h"
|
|
#include "ZNCString.h"
|
|
#include "Listener.h"
|
|
+#include <string>
|
|
#include <sstream>
|
|
#include <utility>
|
|
|
|
using std::stringstream;
|
|
using std::make_pair;
|
|
+using std::string;
|
|
|
|
/* Stuff to be able to write this:
|
|
// i will be name of local variable, see below
|
|
@@ -55,7 +57,7 @@ class CWebAdminMod : public CGlobalModul
|
|
public:
|
|
GLOBALMODCONSTRUCTOR(CWebAdminMod) {
|
|
VPair vParams;
|
|
- vParams.push_back(make_pair("user", ""));
|
|
+ vParams.push_back(make_pair((string)"user", (string)""));
|
|
AddSubPage(new CWebSubPage("settings", "Global Settings", CWebSubPage::F_ADMIN));
|
|
AddSubPage(new CWebSubPage("edituser", "Your Settings", vParams));
|
|
AddSubPage(new CWebSubPage("traffic", "Traffic Info", CWebSubPage::F_ADMIN));
|