Wow! Merged the branch, streams are updated, and there's no more FString, run

the fixstrings.sh script in the support directory to (hopefully) automatically
update your projects.

4 files changed, 8 insertions, 8 deletions

diff --git a/src/compat/linux.h b/src/compat/linux.h
index ccc8536..7eaed8e 100644
--- a/src/compat/linux.h
+++ b/src/compat/linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2010 Xagasoft, All rights reserved.
+ * Copyright (C) 2007-2011 Xagasoft, All rights reserved.
  *
  * This file is part of the libbu++ library and is released under the
  * terms of the license contained in the file LICENSE.
diff --git a/src/compat/osx.h b/src/compat/osx.h
index 7169d7e..19628a3 100644
--- a/src/compat/osx.h
+++ b/src/compat/osx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2010 Xagasoft, All rights reserved.
+ * Copyright (C) 2007-2011 Xagasoft, All rights reserved.
  *
  * This file is part of the libbu++ library and is released under the
  * terms of the license contained in the file LICENSE.
diff --git a/src/compat/win32.cpp b/src/compat/win32.cpp
index 052644a..b689322 100644
--- a/src/compat/win32.cpp
+++ b/src/compat/win32.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2010 Xagasoft, All rights reserved.
+ * Copyright (C) 2007-2011 Xagasoft, All rights reserved.
  *
  * This file is part of the libbu++ library and is released under the
  * terms of the license contained in the file LICENSE.
@@ -162,7 +162,7 @@ int Bu::Winsock2::__WSAFDIsSet( SOCKET s, fd_set *set ) {
         return (*Bu::Winsock2::_fnptr___WSAFDIsSet)( s, set );
 }
 
-Bu::FString Bu::getLastWinError()
+Bu::String Bu::getLastWinError()
 {
     LPVOID lpMsgBuf;
     DWORD dw = GetLastError(); 
@@ -177,7 +177,7 @@ Bu::FString Bu::getLastWinError()
         (LPSTR) &lpMsgBuf,
         0, NULL );
 
-        Bu::FString sRet( (char *)lpMsgBuf );
+        Bu::String sRet( (char *)lpMsgBuf );
 
     LocalFree(lpMsgBuf);
 
diff --git a/src/compat/win32.h b/src/compat/win32.h
index ea0ae53..1d82fbe 100644
--- a/src/compat/win32.h
+++ b/src/compat/win32.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2010 Xagasoft, All rights reserved.
+ * Copyright (C) 2007-2011 Xagasoft, All rights reserved.
  *
  * This file is part of the libbu++ library and is released under the
  * terms of the license contained in the file LICENSE.
@@ -18,7 +18,7 @@ extern "C"
 }
 #endif
 
-#include "bu/fstring.h"
+#include "bu/string.h"
 #include "bu/singleton.h"
 
 #ifndef TEMP_FAILURE_RETRY
@@ -90,7 +90,7 @@ namespace Bu
                 static char *gai_strerror( int iCode );
         };
 
-        Bu::FString getLastWinError();
+        Bu::String getLastWinError();
 };
 
 #ifdef FD_ISSET