Merge pull request #767 from lioncash/namespaces

Get rid of instances of "using namespace std;" in the project

2 files changed, 8 insertions, 10 deletions

diff --git a/Source/Core/AudioCommon/aldlist.cpp b/Source/Core/AudioCommon/aldlist.cpp
index 6e506d57c2..a849aeba68 100644
--- a/Source/Core/AudioCommon/aldlist.cpp
+++ b/Source/Core/AudioCommon/aldlist.cpp
@@ -86,7 +86,7 @@ ALDeviceList::ALDeviceList()
 							alcGetIntegerv(device, ALC_MAJOR_VERSION, sizeof(s32), &ALDeviceInfo.iMajorVersion);
 							alcGetIntegerv(device, ALC_MINOR_VERSION, sizeof(s32), &ALDeviceInfo.iMinorVersion);
 
-							ALDeviceInfo.pvstrExtensions = new vector<string>;
+							ALDeviceInfo.pvstrExtensions = new std::vector<std::string>;
 
 							// Check for ALC Extensions
 							if (alcIsExtensionPresent(device, "ALC_EXT_CAPTURE") == AL_TRUE)
diff --git a/Source/Core/AudioCommon/aldlist.h b/Source/Core/AudioCommon/aldlist.h
index fabe435233..c24ce92651 100644
--- a/Source/Core/AudioCommon/aldlist.h
+++ b/Source/Core/AudioCommon/aldlist.h
@@ -10,22 +10,20 @@
 								//'255' characters in the browser information"
 #endif
 
-using namespace std;
-
 typedef struct
 {
-	string          strDeviceName;
-	s32             iMajorVersion;
-	s32             iMinorVersion;
-	u32             uiSourceCount;
-	vector<string>* pvstrExtensions;
-	bool            bSelected;
+	std::string               strDeviceName;
+	s32                       iMajorVersion;
+	s32                       iMinorVersion;
+	u32                       uiSourceCount;
+	std::vector<std::string>* pvstrExtensions;
+	bool                      bSelected;
 } ALDEVICEINFO, *LPALDEVICEINFO;
 
 class ALDeviceList
 {
 private:
-	vector<ALDEVICEINFO> vDeviceInfo;
+	std::vector<ALDEVICEINFO> vDeviceInfo;
 	s32 defaultDeviceIndex;
 	s32 filterIndex;