Updated support for Green Hills INTEGRITY and INTEGRITY-178 RTOS

.gitignore

@@ -17,6 +17,10 @@
 *S_T.inl
 *.bmak
 *.recipe
+*.gpj
+*.int
+*.custom_build_rule
+*.empty_html_file
 
 .depend.*
 GNUmakefile*
@@ -32,6 +36,9 @@ lib*.dylib
 *~
 ipch/
 *.vsidx
+.vs/
+Static_Release/
+Static_Debug/
 
 /ACE/ace/config.h
 /ACE/bin/MakeProjectCreator/config/default.features

ACE/NEWS

@@ -18,6 +18,9 @@ USER VISIBLE CHANGES BETWEEN ACE-8.0.2 and ACE-8.0.3
 
 . Dropped support for Embarcadero C++ Builder bcc32c and bcc64 compilers
 
+. Updated support for Green Hills INTEGRITY and INTEGRITY-178 tuMP RTOS.
+  Tested on INTEGRITY 11.4.6 and INTEGRITY-178 5.0.0.
+
 USER VISIBLE CHANGES BETWEEN ACE-8.0.1 and ACE-8.0.2
 ====================================================
 

ACE/ace/ACE.inl

@@ -216,7 +216,7 @@ ACE::sendv_n (ACE_HANDLE handle,
 ACE_INLINE ssize_t
 ACE::send_i (ACE_HANDLE handle, const void *buf, size_t len)
 {
-#if defined (ACE_WIN32) || defined (ACE_MQX)
+#if defined (ACE_WIN32) || defined (ACE_MQX) || defined (__ghs__)
   return ACE_OS::send (handle, (const char *) buf, len);
 #else
   return ACE_OS::write (handle, (const char *) buf, len);
@@ -226,7 +226,7 @@ ACE::send_i (ACE_HANDLE handle, const void *buf, size_t len)
 ACE_INLINE ssize_t
 ACE::recv_i (ACE_HANDLE handle, void *buf, size_t len)
 {
-#if defined (ACE_WIN32) || defined (ACE_MQX)
+#if defined (ACE_WIN32) || defined (ACE_MQX) || defined (__ghs__)
   return ACE_OS::recv (handle, (char *) buf, len);
 #else
   return ACE_OS::read (handle, (char *) buf, len);

ACE/ace/Asynch_Pseudo_Task.cpp

@@ -49,9 +49,9 @@ ACE_Asynch_Pseudo_Task::svc ()
 
   sigset_t RT_signals;
 
-  sigemptyset (&RT_signals);
+  ACE_OS::sigemptyset (&RT_signals);
   for (int si = ACE_SIGRTMIN; si <= ACE_SIGRTMAX; si++)
-    sigaddset (&RT_signals, si);
+    ACE_OS::sigaddset (&RT_signals, si);
 
   if (ACE_OS::pthread_sigmask (SIG_BLOCK, &RT_signals, 0) != 0)
     ACELIB_ERROR ((LM_ERROR,

ACE/ace/CDR_Size.h

@@ -79,7 +79,10 @@ class ACE_Export ACE_SizeCDR
   ACE_CDR::Boolean write_wstring (ACE_CDR::ULong length,
                                   const ACE_CDR::WChar *x);
   ACE_CDR::Boolean write_string (const std::string &x);
+#if !defined (ACE_LACKS_STD_STRING_VIEW)
   ACE_CDR::Boolean write_string_view (const std::string_view &x);
+#endif
+
 #if !defined(ACE_LACKS_STD_WSTRING)
   ACE_CDR::Boolean write_wstring (const std::wstring &x);
 #endif
@@ -231,8 +234,10 @@ extern ACE_Export ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss,
                                                const ACE_CDR::WChar* x);
 extern ACE_Export ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss,
                                                const std::string& x);
+#if !defined (ACE_LACKS_STD_STRING_VIEW)
 extern ACE_Export ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss,
                                                const std::string_view& x);
+#endif
 #if !defined(ACE_LACKS_STD_WSTRING)
 extern ACE_Export ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss,
                                                const std::wstring& x);

ACE/ace/CDR_Size.inl

@@ -152,6 +152,7 @@ ACE_SizeCDR::write_string (const std::string &x)
                              x.empty () ? 0 : x.c_str ());
 }
 
+#if !defined (ACE_LACKS_STD_STRING_VIEW)
 ACE_INLINE ACE_CDR::Boolean
 ACE_SizeCDR::write_string_view (const std::string_view &x)
 {
@@ -160,6 +161,7 @@ ACE_SizeCDR::write_string_view (const std::string_view &x)
   return this->write_string (len,
                              x.empty () ? 0 : x.data ());
 }
+#endif
 
 #if !defined(ACE_LACKS_STD_WSTRING)
 ACE_INLINE ACE_CDR::Boolean
@@ -408,12 +410,14 @@ operator<< (ACE_SizeCDR &ss, const std::string& x)
   return ss.good_bit ();
 }
 
+#if !defined (ACE_LACKS_STD_STRING_VIEW)
 ACE_INLINE ACE_CDR::Boolean
 operator<< (ACE_SizeCDR &ss, const std::string_view& x)
 {
   ss.write_string_view (x);
   return ss.good_bit ();
 }
+#endif
 
 #if !defined(ACE_LACKS_STD_WSTRING)
 ACE_INLINE ACE_CDR::Boolean

ACE/ace/CDR_Stream.cpp

@@ -1707,14 +1707,18 @@ ACE_InputCDR::read_string (std::string& x)
   // the memory is allocated.
   if (len > 0 && len <= this->length())
     {
+#if !defined (ACE_STD_ALLOCATOR_NOTHROW)
       try
         {
+#endif
           x.resize (len-1); // no need to include the terminating '\0' here
+#if !defined (ACE_STD_ALLOCATOR_NOTHROW)
         }
       catch (const std::bad_alloc&)
         {
           return false;
         }
+#endif
 
       if (len == 0 || this->read_char_array (&x[0], len-1))
       {
@@ -1763,15 +1767,18 @@ ACE_InputCDR::read_wstring (std::wstring& x)
           len /=
             ACE_Utils::truncate_cast<ACE_CDR::ULong> (
               ACE_OutputCDR::wchar_maxbytes_);
-
+#if !defined (ACE_STD_ALLOCATOR_NOTHROW)
           try
             {
+#endif
               x.resize (len);
+#if !defined (ACE_STD_ALLOCATOR_NOTHROW)
             }
           catch (const std::bad_alloc&)
             {
               return false;
             }
+#endif
 
           if (this->read_wchar_array (&x[0], len))
             {
@@ -1780,14 +1787,18 @@ ACE_InputCDR::read_wstring (std::wstring& x)
         }
       else
         {
+#if !defined (ACE_STD_ALLOCATOR_NOTHROW)
           try
             {
+#endif
               x.resize (len-1); // no need to include the terminating '\0' here
+#if !defined (ACE_STD_ALLOCATOR_NOTHROW)
             }
           catch (const std::bad_alloc&)
             {
               return false;
             }
+#endif
 
           if (len == 1 || this->read_wchar_array (&x[0], len-1))
             {

ACE/ace/CDR_Stream.h

@@ -57,7 +57,10 @@
 #endif /* ACE_HAS_MONITOR_POINTS==1 */
 
 #include <string>
+
+#if !defined (ACE_LACKS_STD_STRING_VIEW)
 #include <string_view>
+#endif
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -285,7 +288,9 @@ class ACE_Export ACE_OutputCDR
   ACE_CDR::Boolean write_wstring (ACE_CDR::ULong length,
                                   const ACE_CDR::WChar *x);
   ACE_CDR::Boolean write_string (const std::string &x);
+#if !defined (ACE_LACKS_STD_STRING_VIEW)
   ACE_CDR::Boolean write_string_view (const std::string_view &x);
+#endif
 #if !defined(ACE_LACKS_STD_WSTRING)
   ACE_CDR::Boolean write_wstring (const std::wstring &x);
 #endif
@@ -1439,8 +1444,10 @@ extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
                                                ACE_OutputCDR::from_std_string x);
 extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
                                                const std::string& x);
+#if !defined (ACE_LACKS_STD_STRING_VIEW)
 extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
                                                const std::string_view& x);
+#endif
 #if !defined(ACE_LACKS_STD_WSTRING)
 extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
                                                ACE_OutputCDR::from_std_wstring x);

ACE/ace/CDR_Stream.inl

@@ -368,6 +368,7 @@ ACE_OutputCDR::write_string (const std::string &x)
                              x.empty () ? 0 : x.c_str ());
 }
 
+#if !defined (ACE_LACKS_STD_STRING_VIEW)
 ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::write_string_view (const std::string_view &x)
 {
@@ -376,6 +377,7 @@ ACE_OutputCDR::write_string_view (const std::string_view &x)
   return this->write_string (len,
                              x.empty () ? 0 : x.data ());
 }
+#endif
 
 #if !defined(ACE_LACKS_STD_WSTRING)
 ACE_INLINE ACE_CDR::Boolean
@@ -1394,12 +1396,14 @@ operator<< (ACE_OutputCDR &os, const std::string& x)
   return os.good_bit ();
 }
 
+#if !defined (ACE_LACKS_STD_STRING_VIEW)
 ACE_INLINE ACE_CDR::Boolean
 operator<< (ACE_OutputCDR &os, const std::string_view& x)
 {
   os.write_string_view (x);
   return os.good_bit ();
 }
+#endif
 
 #if !defined(ACE_LACKS_STD_WSTRING)
 ACE_INLINE ACE_CDR::Boolean