std:: fixes from HEAD.

3 files changed, 11 insertions, 12 deletions

diff --git a/HISTORY b/HISTORY
index 343804f..f30b25d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -251,6 +251,8 @@ NOTE: I havent found time to include all of the languages, will be done in pre2
 - extended cDxr3MemcpyBench::Rdtsc(uint32_t config_flags): support for
   non-x86 archs, support for cpu's, which dont support rdtsc timing
   (Christian Gmeiner)
+- using now std::string instead of namespace std
+  (bug #1044069, Christian Gmeiner)
 - removed extra log commands in dxr3outputthread.c (Christian Gmeiner)
 - fixed #includes: moved #include "dxr3osd.h" from dxr3interface.h to
   dxr3interface.c, removed not needed #includes (Christian Gmeiner)
diff --git a/dxr3device.h b/dxr3device.h
index 727446d..2c17c62 100644
--- a/dxr3device.h
+++ b/dxr3device.h
@@ -28,7 +28,6 @@
 #include "dxr3demuxdevice.h"
 #include "dxr3spudecoder.h"
 #include <string>
-using namespace std;
 
 // ==================================
 // our device :)
@@ -83,7 +82,7 @@ protected:
 	cDxr3DemuxDevice	m_DemuxDevice;
     bool				m_AC3Present;
     bool				m_CalledBySet;
-	string				m_strBuf;
+	std::string			m_strBuf;
 	int					m_Offset;
 
     //virtual bool SetPlayMode(ePlayMode PlayMode);
diff --git a/dxr3unixserversocket.c b/dxr3unixserversocket.c
index f7b7cee..8153515 100644
--- a/dxr3unixserversocket.c
+++ b/dxr3unixserversocket.c
@@ -32,8 +32,6 @@
 #include "dxr3interface.h"
 #include "dxr3log.h"
 
-using namespace std;
-
 #ifndef SOCKET_CHMOD
 #define SOCKET_CHMOD 0660
 #endif
@@ -147,12 +145,12 @@ void cDxr3StartStopSocket::SendStatus()
 {
     if (cDxr3Interface::Instance().IsExternalReleased()) 
 	{
-        string res("CloseDxr3DeviceRsp\n");
+		std::string res("CloseDxr3DeviceRsp\n");
         write(m_fdConnectionSocket, res.c_str(), res.size());
     } 
 	else 
 	{
-        string res("OpenDxr3DeviceRsp\n");
+        std::string res("OpenDxr3DeviceRsp\n");
         write(m_fdConnectionSocket, res.c_str(), res.size());
     }
 }
@@ -162,26 +160,26 @@ void cDxr3StartStopSocket::ProcessMessage(void)
 {
     cLog::Instance() << "cDxr3StartStopSocket::ProcessMessage Rec: " << (const char*) m_msg << "\n";
     
-    if (string((const char*)m_msg) == string("OpenDxr3DeviceCmd")) 
+    if (std::string((const char*)m_msg) == std::string("OpenDxr3DeviceCmd")) 
 	{
         cDxr3Interface::Instance().ExternalReopenDevices();
         SendStatus();
     } 
-	else if (string((const char*)m_msg) == string("CloseDxr3DeviceCmd")) 
+	else if (std::string((const char*)m_msg) == std::string("CloseDxr3DeviceCmd")) 
 	{
         cDxr3Interface::Instance().ExternalReleaseDevices();
         SendStatus();
     }
-	else if (string((const char*)m_msg) == string("StatusDxr3DeviceCmd")) 
+	else if (std::string((const char*)m_msg) == std::string("StatusDxr3DeviceCmd")) 
 	{
         SendStatus();
     } 
-	else if (string((const char *)m_msg) == string("SaveDxr3DeviceCmd")) 
+	else if (std::string((const char *)m_msg) == std::string("SaveDxr3DeviceCmd")) 
 	{
         m_bSavedState = cDxr3Interface::Instance().IsExternalReleased();
         SendStatus();
     } 
-	else if (string((const char *)m_msg) == string("RestoreDxr3DeviceCmd")) 
+	else if (std::string((const char *)m_msg) == std::string("RestoreDxr3DeviceCmd")) 
 	{
         if (m_bSavedState) 
 		{
@@ -195,7 +193,7 @@ void cDxr3StartStopSocket::ProcessMessage(void)
     } 
 	else 
 	{
-        string res("Error\n");
+        std::string res("Error\n");
         write(m_fdConnectionSocket, res.c_str(), res.size());
     }
 }