CWS-TOOLING: integrate CWS sb116

6 files changed, 21 insertions, 27 deletions

diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index 44a085bc9..b177deb48 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -118,20 +118,6 @@ extern "C" {
 #	include <machine/param.h>
 #endif
 
-#ifdef IRIX
-#   include <sys/endian.h>
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#	undef _BIG_ENDIAN
-#	undef _PDP_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#	undef _LITTLE_ENDIAN
-#	undef _PDP_ENDIAN
-#   elif BYTE_ORDER == PDP_ENDIAN
-#	undef _LITTLE_ENDIAN
-#	undef _BIG_ENDIAN
-#   endif
-#endif
-
 #ifdef _WIN16
 #	define	_LITTLE_ENDIAN
 #endif
@@ -166,8 +152,7 @@ extern "C" {
 #if !defined(_WIN32)  && !defined(_WIN16) && !defined(OS2)   && \
     !defined(LINUX)   && !defined(NETBSD) && !defined(SCO)   && \
     !defined(AIX)     && !defined(HPUX)   && \
-    !defined(SOLARIS) && !defined(IRIX)   && \
-    !defined(MACOSX) && !defined(FREEBSD)
+    !defined(SOLARIS) && !defined(MACOSX) && !defined(FREEBSD)
 #	error "Target platform not specified !"
 #endif
 
diff --git a/sal/inc/osl/thread.hxx b/sal/inc/osl/thread.hxx
index 1fb3bef6b..0f51a1252 100644
--- a/sal/inc/osl/thread.hxx
+++ b/sal/inc/osl/thread.hxx
@@ -117,7 +117,7 @@ public:
         osl_joinWithThread(m_hThread);
     }
 
-    sal_Bool SAL_CALL isRunning() 
+    sal_Bool SAL_CALL isRunning() const
     {
         return osl_isThreadRunning(m_hThread);
     }
@@ -128,7 +128,7 @@ public:
             osl_setThreadPriority(m_hThread, Priority);
     }
 
-    oslThreadPriority SAL_CALL getPriority()
+    oslThreadPriority SAL_CALL getPriority() const
     {
         return m_hThread ? osl_getThreadPriority(m_hThread) : osl_Thread_PriorityUnknown;
     }
diff --git a/sal/inc/rtl/math.hxx b/sal/inc/rtl/math.hxx
index 2c180170d..e6481bfe0 100644
--- a/sal/inc/rtl/math.hxx
+++ b/sal/inc/rtl/math.hxx
@@ -357,17 +357,28 @@ inline bool isSignBitSet(double d)
  */
 inline void setInf(double * pd, bool bNegative)
 {
-    reinterpret_cast< sal_math_Double * >(pd)->w32_parts.msw
-        = bNegative ? 0xFFF00000 : 0x7FF00000;
-    reinterpret_cast< sal_math_Double * >(pd)->w32_parts.lsw = 0;
+    union
+    {
+        double sd;
+        sal_math_Double md;
+    };
+    md.w32_parts.msw = bNegative ? 0xFFF00000 : 0x7FF00000;
+    md.w32_parts.lsw = 0;
+    *pd = sd;
 }
 
 /** Set a QNAN.
  */
 inline void setNan(double * pd)
 {
-    reinterpret_cast< sal_math_Double * >(pd)->w32_parts.msw = 0x7FFFFFFF;
-    reinterpret_cast< sal_math_Double * >(pd)->w32_parts.lsw = 0xFFFFFFFF;
+    union
+    {
+        double sd;
+        sal_math_Double md;
+    };
+    md.w32_parts.msw = 0x7FFFFFFF;
+    md.w32_parts.lsw = 0xFFFFFFFF;
+    *pd = sd;
 }
 
 /** If a value is a valid argument for sin(), cos(), tan().
diff --git a/sal/inc/rtl/uuid.h b/sal/inc/rtl/uuid.h
index ea514ff75..81103dcd6 100644
--- a/sal/inc/rtl/uuid.h
+++ b/sal/inc/rtl/uuid.h
@@ -201,8 +201,6 @@ void SAL_CALL rtl_createNamedUuid(
 #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10
 #elif MACOSX
 #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 100000
-#elif IRIX
-#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10
 #else
 #error "System time resolution must be calculated!"
 #endif
diff --git a/sal/inc/sal/alloca.h b/sal/inc/sal/alloca.h
index 2eb04de8f..bfbddf424 100644
--- a/sal/inc/sal/alloca.h
+++ b/sal/inc/sal/alloca.h
@@ -31,7 +31,7 @@
 #ifndef INCLUDED_SAL_ALLOCA_H
 #define INCLUDED_SAL_ALLOCA_H
 
-#if defined (SOLARIS) || defined (LINUX) || defined (IRIX) || defined(__EMX__)
+#if defined (SOLARIS) || defined (LINUX) || defined(__EMX__)
 
 #ifndef INCLUDED_ALLOCA_H
 #include <alloca.h>
diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index 5cacfc8e2..702f87b2a 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -102,7 +102,7 @@ extern "C" {
 #define SAL_SYSCONFIGFILE( name ) name ".ini"
 #endif
 
-#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(SCO) || defined(IRIX)
+#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(SCO)
 #define SAL_UNX
 #define SAL_DLLEXTENSION ".so"
 #define SAL_DLLPREFIX "lib"