From 68d175e786962a7c6f8a2f550e0fcedd2fa0a106 Mon Sep 17 00:00:00 2001
From: lvw <lvw@e10066b5-e1e2-0310-b819-94efdf66514b>
Date: Mon, 4 Oct 2004 20:47:58 +0000
Subject: Added a patch to correct minor errors. Further, remove using
 namespace directives in order to remain compatible with g++ 2.95.4

git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk@200 e10066b5-e1e2-0310-b819-94efdf66514b
---
 muggle-plugin/mg_database.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'muggle-plugin/mg_database.c')

diff --git a/muggle-plugin/mg_database.c b/muggle-plugin/mg_database.c
index 3ad6fc9..fa38e17 100644
--- a/muggle-plugin/mg_database.c
+++ b/muggle-plugin/mg_database.c
@@ -9,14 +9,13 @@
 
 #include "mg_database.h"
 
-using namespace std;
 
 mgDB::mgDB() 
 {
 }
 
-mgDB::mgDB(string host, string name, 
-	   string user, string pass,
+mgDB::mgDB(std::string host, std::string name, 
+	   std::string user, std::string pass,
 	   int port) 
 {
 }
@@ -31,13 +30,13 @@ MYSQL mgDB::getDBHandle()
   return m_dbase;
 }
 
-string mgDB::escape_string( MYSQL *db, string s )
+std::string mgDB::escape_string( MYSQL *db, std::string s )
 {
   char *escbuf = (char *) malloc( 2*s.size() + 1 );
 
   int len = mysql_real_escape_string( db, escbuf, s.c_str(), s.size() );
 
-  string r = string( escbuf );
+  std::string r = std::string( escbuf );
   free( escbuf );
 
   return r;
-- 
cgit v1.2.3