Index: trunk/BNC/src/RTCM/RTCM2.cpp
===================================================================
--- trunk/BNC/src/RTCM/RTCM2.cpp	(revision 6787)
+++ trunk/BNC/src/RTCM/RTCM2.cpp	(revision 6788)
@@ -292,5 +292,5 @@
 // Get next 30bit word from string
 
-void ThirtyBitWord::get(const string& buf) {
+void ThirtyBitWord::get(const std::string& buf) {
 
   // Check if string is long enough
@@ -321,5 +321,5 @@
 // Get next 30bit word from file
 
-void ThirtyBitWord::get(istream& inp) {
+void ThirtyBitWord::get(std::istream& inp) {
 
   unsigned char b;
@@ -342,5 +342,5 @@
 // Get next header word from string
 
-void ThirtyBitWord::getHeader(string& buf) {
+void ThirtyBitWord::getHeader(std::string& buf) {
 
   const unsigned int wordLen = 5; // Number of bytes representing a 30-bit word
@@ -381,5 +381,5 @@
 // Get next header word from file
 
-void ThirtyBitWord::getHeader(istream& inp) {
+void ThirtyBitWord::getHeader(std::istream& inp) {
 
   unsigned char b;
Index: trunk/BNC/src/serial/posix_qextserialport.cpp
===================================================================
--- trunk/BNC/src/serial/posix_qextserialport.cpp	(revision 6787)
+++ trunk/BNC/src/serial/posix_qextserialport.cpp	(revision 6788)
@@ -22,5 +22,5 @@
 \fn Posix_QextSerialPort::Posix_QextSerialPort()
 Default constructor.  Note that the name of the device used by a QextSerialPort constructed with
-this constructor will be determined by #defined constants, or lack thereof - the default behavior
+this constructor will be determined by defined constants, or lack thereof - the default behavior
 is the same as _TTY_LINUX_.  Possible naming conventions and their associated constants are:
 
Index: trunk/BNC/src/serial/qextserialport.cpp
===================================================================
--- trunk/BNC/src/serial/qextserialport.cpp	(revision 6787)
+++ trunk/BNC/src/serial/qextserialport.cpp	(revision 6788)
@@ -24,5 +24,5 @@
 \fn QextSerialPort::QextSerialPort()
 Default constructor.  Note that the naming convention used by a QextSerialPort constructed with
-this constructor will be determined by #defined constants, or lack thereof - the default behavior
+this constructor will be determined by defined constants, or lack thereof - the default behavior
 is the same as _TTY_LINUX_.  Possible naming conventions and their associated constants are:
 
Index: trunk/BNC/src/serial/win_qextserialport.cpp
===================================================================
--- trunk/BNC/src/serial/win_qextserialport.cpp	(revision 6787)
+++ trunk/BNC/src/serial/win_qextserialport.cpp	(revision 6788)
@@ -24,5 +24,5 @@
 \fn Win_QextSerialPort::Win_QextSerialPort()
 Default constructor.  Note that the name of the device used by a Win_QextSerialPort constructed
-with this constructor will be determined by #defined constants, or lack thereof - the default
+with this constructor will be determined by defined constants, or lack thereof - the default
 behavior is the same as _TTY_LINUX_.  Possible naming conventions and their associated constants
 are: