X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmisc%2Fsgstream.cxx;h=6d5352c86ae2a6f1cefa845cd3d6cfb6df648318;hb=2e71b64de1d937e2b7c34dd4a2365be455d0b82a;hp=dec7711e508e1a2510684493243df09741bfc1e8;hpb=b8ce139b8a6cb3e49432e7fbee1afafd06975dcc;p=simgear.git

diff --git a/simgear/misc/sgstream.cxx b/simgear/misc/sgstream.cxx
index dec7711e..6d5352c8 100644
--- a/simgear/misc/sgstream.cxx
+++ b/simgear/misc/sgstream.cxx
@@ -14,23 +14,22 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
+#include <simgear/compiler.h>
+#include <string>
 #include <ctype.h> // isspace()
-
-#ifdef SG_HAVE_STD_INCLUDES
-# include <cerrno>
-#else
-# include <errno.h>
-#endif
+#include <cerrno>
 
 #include "sgstream.hxx"
 
+using std::string;
+using std::istream;
+
 sg_gzifstream::sg_gzifstream()
     : istream(&gzbuf)
 {
@@ -104,11 +103,7 @@ skipeol( istream& in )
     char c = '\0';
     // skip to end of line.
 
-#ifdef __MWERKS__
-    while ( in.get(c) && c != '\0' ) {
-#else
     while ( in.get(c) ) {
-#endif
     	if ( (c == '\n') || (c == '\r') ) {
 	    break;
 	}	
@@ -120,17 +115,9 @@ skipeol( istream& in )
 istream&
 skipws( istream& in ) {
     char c;
-#ifdef __MWERKS__
-    while ( in.get(c) && c != '\0' ) {
-#else
     while ( in.get(c) ) {
-#endif
 
-#ifdef __MWERKS__
-	if ( ! isspace( c ) && c != '\n' ) {
-#else
 	if ( ! isspace( c ) ) {
-#endif
 	    // put pack the non-space character
 	    in.putback(c);
 	    break;
@@ -145,11 +132,7 @@ skipcomment( istream& in )
     while ( in )
     {
 	// skip whitespace
-#ifdef __MWERKS__
-	in >> ::skipws;
-#else
 	in >> skipws;
-#endif
 
 	char c;
 	if ( in.get( c ) && c != '#' )