cleanup stlplus files

[chaz/yoink] / src / stlplus / strings / strings_fixes.hpp

diff --git a/src/stlplus/strings/strings_fixes.hpp b/src/stlplus/strings/strings_fixes.hpp
index 2ed1dc5ea16d27b08668fcb23bb5e4d8605913b5..c6368cefb41d3e7efc5ba84a80bec82a8d6d10d8 100644 (file)
--- a/src/stlplus/strings/strings_fixes.hpp
+++ b/src/stlplus/strings/strings_fixes.hpp
@@ -1,56 +1,56 @@
-#ifndef STLPLUS_STRINGS_FIXES\r
-#define STLPLUS_STRINGS_FIXES\r
-////////////////////////////////////////////////////////////////////////////////\r
-\r
-//   Author:    Andy Rushton\r
-//   Copyright: (c) Southampton University 1999-2004\r
-//              (c) Andy Rushton           2004-2009\r
-//   License:   BSD License, see ../docs/license.html\r
-\r
-//   Contains work arounds for OS or Compiler specific problems\r
-\r
-////////////////////////////////////////////////////////////////////////////////\r
-\r
-////////////////////////////////////////////////////////////////////////////////\r
-// Problem with MicroSoft defining two different macros to identify Windows\r
-////////////////////////////////////////////////////////////////////////////////\r
-\r
-#if defined(_WIN32) || defined(_WIN32_WCE)\r
-#define MSWINDOWS\r
-#endif\r
-\r
-////////////////////////////////////////////////////////////////////////////////\r
-// Unnecessary compiler warnings\r
-////////////////////////////////////////////////////////////////////////////////\r
-\r
-#ifdef _MSC_VER\r
-// Microsoft Visual Studio\r
-// shut up the following irritating warnings\r
-//   4786 - VC6, identifier string exceeded maximum allowable length and was truncated (only affects debugger)\r
-//   4305 - VC6, identifier type was converted to a smaller type\r
-//   4503 - VC6, decorated name was longer than the maximum the compiler allows (only affects debugger)\r
-//   4309 - VC6, type conversion operation caused a constant to exceeded the space allocated for it\r
-//   4290 - VC6, C++ exception specification ignored\r
-//   4800 - VC6, forcing value to bool 'true' or 'false' (performance warning)\r
-//   4675 - VC7.1, "change" in function overload resolution _might_ have altered program\r
-//   4996 - VC8, 'xxxx' was declared deprecated\r
-#pragma warning(disable: 4786 4305 4503 4309 4290 4800 4675 4996)\r
-#endif\r
-\r
-#ifdef __BORLANDC__\r
-// Borland\r
-// Shut up the following irritating warnings\r
-//   8026 - Functions with exception specifications are not expanded inline\r
-//   8027 - Functions with xxx are not expanded inline\r
-//   8066 - Unreachable code.\r
-//          A break, continue, goto, or return statement was not followed by a\r
-//          label or the end of a loop or function. The compiler checks while,\r
-//          do, and for loops with a constant test condition, and attempts to\r
-//          recognize loops that can't fall through.\r
-#pragma warn -8026\r
-#pragma warn -8027\r
-#pragma warn -8066\r
-#endif\r
-\r
-////////////////////////////////////////////////////////////////////////////////\r
-#endif\r
+#ifndef STLPLUS_STRINGS_FIXES
+#define STLPLUS_STRINGS_FIXES
+////////////////////////////////////////////////////////////////////////////////
+
+//   Author:    Andy Rushton
+//   Copyright: (c) Southampton University 1999-2004
+//              (c) Andy Rushton           2004-2009
+//   License:   BSD License, see ../docs/license.html
+
+//   Contains work arounds for OS or Compiler specific problems
+
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+// Problem with MicroSoft defining two different macros to identify Windows
+////////////////////////////////////////////////////////////////////////////////
+
+#if defined(_WIN32) || defined(_WIN32_WCE)
+#define MSWINDOWS
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Unnecessary compiler warnings
+////////////////////////////////////////////////////////////////////////////////
+
+#ifdef _MSC_VER
+// Microsoft Visual Studio
+// shut up the following irritating warnings
+//   4786 - VC6, identifier string exceeded maximum allowable length and was truncated (only affects debugger)
+//   4305 - VC6, identifier type was converted to a smaller type
+//   4503 - VC6, decorated name was longer than the maximum the compiler allows (only affects debugger)
+//   4309 - VC6, type conversion operation caused a constant to exceeded the space allocated for it
+//   4290 - VC6, C++ exception specification ignored
+//   4800 - VC6, forcing value to bool 'true' or 'false' (performance warning)
+//   4675 - VC7.1, "change" in function overload resolution _might_ have altered program
+//   4996 - VC8, 'xxxx' was declared deprecated
+#pragma warning(disable: 4786 4305 4503 4309 4290 4800 4675 4996)
+#endif
+
+#ifdef __BORLANDC__
+// Borland
+// Shut up the following irritating warnings
+//   8026 - Functions with exception specifications are not expanded inline
+//   8027 - Functions with xxx are not expanded inline
+//   8066 - Unreachable code.
+//          A break, continue, goto, or return statement was not followed by a
+//          label or the end of a loop or function. The compiler checks while,
+//          do, and for loops with a constant test condition, and attempts to
+//          recognize loops that can't fall through.
+#pragma warn -8026
+#pragma warn -8027
+#pragma warn -8066
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+#endif