From: bruceperens <bruceperens@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Fri, 7 Mar 2014 00:08:04 +0000 (+0000)
Subject: No more "using namespace std".
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=a8267aefbae86ae104de1190544352aef452e328;p=freetel-svn-tracking.git

No more "using namespace std".


git-svn-id: https://svn.code.sf.net/p/freetel/code@1410 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/freedv-server/source/driver_manager.cpp b/freedv-server/source/driver_manager.cpp
index dbd5ad62..0c43da2e 100644
--- a/freedv-server/source/driver_manager.cpp
+++ b/freedv-server/source/driver_manager.cpp
@@ -6,8 +6,6 @@
 #include <iostream>
 #include "drivers.h"
 
-using namespace std;
-
 namespace FreeDV {
   // Global instance of the driver manager used to register
   // drivers and to create driver instances.
@@ -20,53 +18,53 @@ namespace FreeDV {
   {
   }
 
-  ostream &
-  DriverManager::print(ostream & s) const
+  std::ostream &
+  DriverManager::print(std::ostream & s) const
   {
     s << "AudioInput: ";
     for (auto i = audio_input_drivers.begin(); i != audio_input_drivers.end(); i++ )
       s << i->first << " ";
-    s << endl;
+    s << std::endl;
 
     s << "AudioOutput: ";
     for (auto i = audio_output_drivers.begin(); i != audio_output_drivers.end(); i++ )
       s << i->first << " ";
-    s << endl;
+    s << std::endl;
 
     s << "Codec: ";
     for (auto i = codecs.begin(); i != codecs.end(); i++ )
       s << i->first << " ";
-    s << endl;
+    s << std::endl;
 
     s << "Framer: ";
     for (auto i = framers.begin(); i != framers.end(); i++ )
       s << i->first << " ";
-    s << endl;
+    s << std::endl;
 
     s << "KeyingOutput: ";
     for (auto i = keying_output_drivers.begin(); i != keying_output_drivers.end(); i++ )
       s << i->first << " ";
-    s << endl;
+    s << std::endl;
 
     s << "Modem: ";
     for (auto i = modems.begin(); i != modems.end(); i++ )
       s << i->first << " ";
-    s << endl;
+    s << std::endl;
 
     s << "PTTInput: ";
     for (auto i = ptt_input_drivers.begin(); i != ptt_input_drivers.end(); i++ )
       s << i->first << " ";
-    s << endl;
+    s << std::endl;
 
     s << "TextInput: ";
     for (auto i = text_input_drivers.begin(); i != text_input_drivers.end(); i++ )
       s << i->first << " ";
-    s << endl;
+    s << std::endl;
 
     s << "UserInterface: ";
     for (auto i = user_interface_drivers.begin(); i != user_interface_drivers.end(); i++ )
       s << i->first << " ";
-    s << endl;
+    s << std::endl;
 
     return s;
   }
diff --git a/freedv-server/source/drivers.h b/freedv-server/source/drivers.h
index 52e6a0f2..37096e08 100644
--- a/freedv-server/source/drivers.h
+++ b/freedv-server/source/drivers.h
@@ -716,6 +716,15 @@ namespace FreeDV {
 
 /// Namespace used for the entire program.
 namespace FreeDV {
+  /// Utility functions.
+  
+  /// Non-template version of min().
+  inline std::size_t
+  min(std::size_t a, std::size_t b)
+  {
+    a < b ? a : b;
+  }
+
   /// Device driver manager. Allows for registration and enumeration of device
   /// drivers. Instantiates device drivers on request.
   class DriverManager {
diff --git a/freedv-server/source/interfaces.cpp b/freedv-server/source/interfaces.cpp
index 4315b68f..ea7f279a 100644
--- a/freedv-server/source/interfaces.cpp
+++ b/freedv-server/source/interfaces.cpp
@@ -46,19 +46,17 @@ namespace FreeDV {
   std::ostream &
   Interfaces::print(std::ostream & stream) const
   {
-    using namespace std;
-
-    stream << "--codec=" << *codec << endl;
-    stream << "--gui=" << *user_interface << endl;
-    stream << "--keying=" << *keying_output << endl;
-    stream << "--loudspeaker=" << *loudspeaker << endl;
-    stream << "--microphone=" << *microphone << endl;
-    stream << "--modem=" << *modem << endl;
-    stream << "--ptt-digital=" << *ptt_input_digital << endl;
-    stream << "--ptt-ssb=" << *ptt_input_ssb << endl;
-    stream << "--receiver=" << *receiver << endl;
-    stream << "--text=" << *text_input << endl;
-    stream << "--transmitter=" << *transmitter << endl;
+    stream << "--codec=" << *codec << std::endl;
+    stream << "--gui=" << *user_interface << std::endl;
+    stream << "--keying=" << *keying_output << std::endl;
+    stream << "--loudspeaker=" << *loudspeaker << std::endl;
+    stream << "--microphone=" << *microphone << std::endl;
+    stream << "--modem=" << *modem << std::endl;
+    stream << "--ptt-digital=" << *ptt_input_digital << std::endl;
+    stream << "--ptt-ssb=" << *ptt_input_ssb << std::endl;
+    stream << "--receiver=" << *receiver << std::endl;
+    stream << "--text=" << *text_input << std::endl;
+    stream << "--transmitter=" << *transmitter << std::endl;
 
     return stream;
   }