Doxygen ...

[simgear.git] / simgear / debug / logstream.hxx

diff --git a/simgear/debug/logstream.hxx b/simgear/debug/logstream.hxx
index bc1a4fbf77f360c5adc74cb5906b1037a3e35708..d622d11712cd929ffd5646de128fa6755533e0a1 100644 (file)
--- a/simgear/debug/logstream.hxx
+++ b/simgear/debug/logstream.hxx
@@ -4,19 +4,20 @@
 //
 // Copyright (C) 1998  Bernie Bright - bbright@c031.aone.net.au
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
+// Library General Public License for more details.
 //
-// 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 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.
 //
 // $Id$
 
@@ -30,7 +31,12 @@
 
 #include <simgear/compiler.h>
 
-#ifdef FG_HAVE_STD_INCLUDES
+// At least Irix needs this
+#ifdef SG_HAVE_NATIVE_SGI_COMPILERS
+#include <char_traits.h>
+#endif
+
+#ifdef SG_HAVE_STD_INCLUDES
 # include <streambuf>
 # include <iostream>
 #else
@@ -38,19 +44,19 @@
 # include <simgear/fg_traits.hxx>
 #endif
 
-#include <simgear/debug_types.h>
+#include <simgear/debug/debug_types.h>
 
-#ifndef FG_HAVE_NATIVE_SGI_COMPILERS
-FG_USING_STD(streambuf);
-FG_USING_STD(ostream);
-FG_USING_STD(cerr);
-FG_USING_STD(endl);
+#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
+SG_USING_STD(streambuf);
+SG_USING_STD(ostream);
+SG_USING_STD(cerr);
+SG_USING_STD(endl);
+#else
+SG_USING_STD(char_traits);
 #endif
 
 #ifdef __MWERKS__
-#  define cerr std::cerr
-#  define endl std::endl
-FG_USING_STD(iostream);
+SG_USING_STD(iostream);
 #endif
 
 //
@@ -71,11 +77,11 @@ class logbuf : public streambuf
 {
 public:
 
-#ifndef FG_HAVE_STD_INCLUDES
+#ifndef SG_HAVE_STD_INCLUDES
     typedef char_traits<char>           traits_type;
     typedef char_traits<char>::int_type int_type;
-    typedef char_traits<char>::pos_type pos_type;
-    typedef char_traits<char>::off_type off_type;
+    // typedef char_traits<char>::pos_type pos_type;
+    // typedef char_traits<char>::off_type off_type;
 #endif
 //     logbuf( streambuf* sb ) : sbuf(sb) {}
     logbuf();
@@ -118,7 +124,7 @@ private:
 inline int
 logbuf::sync()
 {
-#ifdef FG_HAVE_STD_INCLUDES
+#ifdef SG_HAVE_STD_INCLUDES
        return sbuf->pubsync();
 #else
        return sbuf->sync();