INTEGRATION: CWS reportdesign01 (1.10.154); FILE MERGED

2007/10/04 09:03:57 lla 1.10.154.1: #i67655# only updates on some tests to build warning free

1 files changed, 16 insertions, 5 deletions

diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index a140e6d72..81ce9e0f8 100755
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: osl_Socket.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 08:53:15 $
+ *  last change: $Author: ihi $ $Date: 2007-11-20 19:35:27 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -271,7 +271,7 @@ inline ::rtl::ByteSequence UStringIPToByteSequence( ::rtl::OUString aUStr )
         {
             tmpBuffer[nCharCounter] = '\0';
             nCharCounter = 0;
-            bsByteSequence[nByteSeqCounter++] = atoi( tmpBuffer );
+            bsByteSequence[nByteSeqCounter++] = static_cast<sal_Int8>( atoi( tmpBuffer ) );
         }
         pChar++;
     }
@@ -295,6 +295,16 @@ inline void printSocketResult( oslSocketResult eResult )
         case osl_Socket_TimedOut:
             t_print("timeout\n");
             break;
+
+    case osl_Socket_FORCE_EQUAL_SIZE:
+        t_print("FORCE EQUAL SIZE\n");
+        break;
+    case osl_Socket_InProgress:
+        t_print("In Progress\n");
+        break;
+    case osl_Socket_Interrupted:
+        t_print("Interrupted\n");
+        break;
     }
 }
 
@@ -1511,7 +1521,7 @@ namespace osl_Socket
         void ctors_none()
         {
             /// Socket constructor.
-            ::osl::Socket sSocket();
+            // ::osl::Socket sSocket;
     
             CPPUNIT_ASSERT_MESSAGE( "test for ctors_none constructor function: check if the socket was created successfully, if no exception occured", 
                                     1 == 1 );
@@ -1855,7 +1865,8 @@ namespace osl_Socket
             ::rtl::OUString suError = outputError(::rtl::OUString::valueOf(sSocket.getLocalPort( )), 
                 ::rtl::OUString::valueOf((sal_Int32)OSL_INVALID_PORT), 
                 "test for getLocalPort function: first create a new socket, then an invalid socket address, bind them, and check the port assigned.");
-            bOK = ( OSL_INVALID_PORT == sSocket.getLocalPort( ) );
+            sal_Bool bOK = ( OSL_INVALID_PORT == sSocket.getLocalPort( ) );
+            (void)bOK;
 #else
             //on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT
             ::rtl::OUString suError = ::rtl::OUString::createFromAscii( "on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case");