CDR Fixed data type: CDR streaming

tao_idl and tao_ifr back ends now generate errors for fixed
updated .gitignore files based on build results

36 files changed, 189 insertions, 3 deletions

diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp
index ca23038383a..505f4cf79e6 100644
--- a/ACE/ace/CDR_Base.cpp
+++ b/ACE/ace/CDR_Base.cpp
@@ -976,6 +976,20 @@ ACE_CDR::Fixed ACE_CDR::Fixed::from_string (const char *str)
   return f;
 }
 
+ACE_CDR::Fixed ACE_CDR::Fixed::from_octets (const Octet *array, int len)
+{
+  Fixed f;
+  ACE_OS::memcpy (f.value_ + 16 - len, array, len);
+  ACE_OS::memset (f.value_, 0, 16 - len);
+  f.scale_ = 0;
+
+  f.digits_ = len * 2 - 1;
+  if (len > 1 && (array[0] >> 4) == 0)
+    --f.digits_;
+
+  return f;
+}
+
 ACE_CDR::Fixed::operator LongLong () const
 {
   LongLong val (0);
@@ -1115,6 +1129,12 @@ bool ACE_CDR::Fixed::to_string (char *buffer, size_t buffer_size) const
   return true;
 }
 
+const ACE_CDR::Octet *ACE_CDR::Fixed::to_octets (int &n) const
+{
+  n = (this->digits_ + 2) / 2;
+  return 16 - n + reinterpret_cast<const Octet *> (this->value_);
+}
+
 ACE_CDR::Fixed::ConstIterator ACE_CDR::Fixed::pre_add (const ACE_CDR::Fixed &f)
 {
   ConstIterator rhs_iter = f.begin ();
diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h
index 36d35a8c9dd..3afa0615aaa 100644
--- a/ACE/ace/CDR_Base.h
+++ b/ACE/ace/CDR_Base.h
@@ -374,6 +374,7 @@ public:
          static Fixed from_integer (ULongLong val);
          static Fixed from_floating (LongDouble val);
          static Fixed from_string (const char *str);
+         static Fixed from_octets (const Octet *array, int len);
 
          operator LongLong () const;
          operator LongDouble () const;
@@ -382,6 +383,7 @@ public:
          Fixed truncate (UShort scale) const;
 
          bool to_string (char *buffer, size_t buffer_size) const;
+         const Octet *to_octets (int &n) const;
 
          Fixed &operator+= (const Fixed &rhs);
          Fixed &operator-= (const Fixed &rhs);
diff --git a/ACE/ace/CDR_Size.h b/ACE/ace/CDR_Size.h
index ca85b674035..ad229bca388 100644
--- a/ACE/ace/CDR_Size.h
+++ b/ACE/ace/CDR_Size.h
@@ -68,6 +68,7 @@ public:
   ACE_CDR::Boolean write_float (ACE_CDR::Float x);
   ACE_CDR::Boolean write_double (const ACE_CDR::Double &x);
   ACE_CDR::Boolean write_longdouble (const ACE_CDR::LongDouble &x);
+  ACE_CDR::Boolean write_fixed (const ACE_CDR::Fixed &x);
 
   /// For string we offer methods that accept a precomputed length.
   ACE_CDR::Boolean write_string (const ACE_CDR::Char *x);
@@ -201,6 +202,8 @@ extern ACE_Export ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss,
                                                ACE_CDR::Float x);
 extern ACE_Export ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss,
                                                ACE_CDR::Double x);
+extern ACE_Export ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss,
+                                               const ACE_CDR::Fixed &x);
 
 // CDR size-calculating output operator from helper classes
 
diff --git a/ACE/ace/CDR_Size.inl b/ACE/ace/CDR_Size.inl
index fe04ea99955..9b83b6f72e0 100644
--- a/ACE/ace/CDR_Size.inl
+++ b/ACE/ace/CDR_Size.inl
@@ -113,6 +113,13 @@ ACE_SizeCDR::write_longdouble (const ACE_CDR::LongDouble &x)
 }
 
 ACE_INLINE ACE_CDR::Boolean
+ACE_SizeCDR::write_fixed (const ACE_CDR::Fixed &x)
+{
+  return this->write_array (&x, ACE_CDR::OCTET_SIZE, ACE_CDR::OCTET_ALIGN,
+                            (x.fixed_digits () + 2) / 2);
+}
+
+ACE_INLINE ACE_CDR::Boolean
 ACE_SizeCDR::write_string (const ACE_CDR::Char *x)
 {
   if (x != 0)
@@ -345,6 +352,13 @@ operator<< (ACE_SizeCDR &ss, ACE_CDR::Double x)
 }
 
 ACE_INLINE ACE_CDR::Boolean
+operator<< (ACE_SizeCDR &ss, const ACE_CDR::Fixed &x)
+{
+  ss.write_fixed (x);
+  return (ACE_CDR::Boolean) ss.good_bit ();
+}
+
+ACE_INLINE ACE_CDR::Boolean
 operator<< (ACE_SizeCDR &ss, const ACE_CDR::Char *x)
 {
   ss.write_string (x);
diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h
index 7556a42a0dc..8197b0f4be2 100644
--- a/ACE/ace/CDR_Stream.h
+++ b/ACE/ace/CDR_Stream.h
@@ -240,6 +240,7 @@ public:
   ACE_CDR::Boolean write_float (ACE_CDR::Float x);
   ACE_CDR::Boolean write_double (const ACE_CDR::Double &x);
   ACE_CDR::Boolean write_longdouble (const ACE_CDR::LongDouble &x);
+  ACE_CDR::Boolean write_fixed (const ACE_CDR::Fixed &x);
 
   /// For string we offer methods that accept a precomputed length.
   ACE_CDR::Boolean write_string (const ACE_CDR::Char *x);
@@ -368,6 +369,7 @@ public:
   ACE_CDR::Boolean append_float (ACE_InputCDR &);
   ACE_CDR::Boolean append_double (ACE_InputCDR &);
   ACE_CDR::Boolean append_longdouble (ACE_InputCDR &);
+  ACE_CDR::Boolean append_fixed (ACE_InputCDR &);
 
   ACE_CDR::Boolean append_wstring (ACE_InputCDR &);
   ACE_CDR::Boolean append_string (ACE_InputCDR &);
@@ -811,6 +813,7 @@ public:
   ACE_CDR::Boolean read_float (ACE_CDR::Float &x);
   ACE_CDR::Boolean read_double (ACE_CDR::Double &x);
   ACE_CDR::Boolean read_longdouble (ACE_CDR::LongDouble &x);
+  ACE_CDR::Boolean read_fixed (ACE_CDR::Fixed &x);
 
   ACE_CDR::Boolean read_string (ACE_CDR::Char *&x);
   ACE_CDR::Boolean read_string (ACE_CString &x);
@@ -868,6 +871,7 @@ public:
   ACE_CDR::Boolean skip_float (void);
   ACE_CDR::Boolean skip_double (void);
   ACE_CDR::Boolean skip_longdouble (void);
+  ACE_CDR::Boolean skip_fixed (void);
   //@}
 
   /**
@@ -1319,6 +1323,8 @@ extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
                                                ACE_CDR::Float x);
 extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
                                                ACE_CDR::Double x);
+extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                               const ACE_CDR::Fixed &x);
 
 // CDR output operator from helper classes
 
@@ -1362,6 +1368,8 @@ extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
                                                ACE_CDR::Float &x);
 extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
                                                ACE_CDR::Double &x);
+extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
+                                               ACE_CDR::Fixed &x);
 
 // CDR input operator from helper classes
 
diff --git a/ACE/ace/CDR_Stream.inl b/ACE/ace/CDR_Stream.inl
index 6b79c4c6bc9..fdc741146f6 100644
--- a/ACE/ace/CDR_Stream.inl
+++ b/ACE/ace/CDR_Stream.inl
@@ -268,6 +268,14 @@ ACE_OutputCDR::write_longdouble (const ACE_CDR::LongDouble &x)
 }
 
 ACE_INLINE ACE_CDR::Boolean
+ACE_OutputCDR::write_fixed (const ACE_CDR::Fixed &x)
+{
+  int n;
+  const ACE_CDR::Octet *arr = x.to_octets (n);
+  return this->write_array (arr, ACE_CDR::OCTET_SIZE, ACE_CDR::OCTET_ALIGN, n);
+}
+
+ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::write_string (const ACE_CDR::Char *x)
 {
   if (x)
@@ -709,6 +717,25 @@ ACE_InputCDR::read_longdouble (ACE_CDR::LongDouble &x)
   return this->read_16 (&x);
 }
 
+ACE_INLINE ACE_CDR::Boolean
+ACE_InputCDR::read_fixed (ACE_CDR::Fixed &x)
+{
+  ACE_CDR::Octet a[16];
+  for (int i = 0; i < 16; ++i)
+    {
+      if (!this->read_1 (a + i))
+        return false;
+      const unsigned low = a[i] & 0xf;
+      if (low == 0xc || low == 0xd)
+        {
+          x = ACE_CDR::Fixed::from_octets (a, i + 1);
+          return true;
+        }
+    }
+
+  return false;
+}
+
 ACE_INLINE size_t
 ACE_InputCDR::length (void) const
 {
@@ -1016,6 +1043,21 @@ ACE_InputCDR::skip_longdouble (void)
   return this->read_16 (&x);
 }
 
+ACE_INLINE ACE_CDR::Boolean
+ACE_InputCDR::skip_fixed (void)
+{
+  for (int i = 0; i < 16; ++i)
+    {
+      ACE_CDR::Octet x;
+      if (!this->read_1 (&x))
+        return false;
+      const unsigned low = x & 0xf;
+      if (low == 0xc || low == 0xd)
+        return true;
+    }
+  return false;
+}
+
 ACE_INLINE char*
 ACE_InputCDR::end (void)
 {
@@ -1157,6 +1199,13 @@ operator<< (ACE_OutputCDR &os, ACE_CDR::Double x)
 }
 
 ACE_INLINE ACE_CDR::Boolean
+operator<< (ACE_OutputCDR &os, const ACE_CDR::Fixed &x)
+{
+  os.write_fixed (x);
+  return (ACE_CDR::Boolean) os.good_bit ();
+}
+
+ACE_INLINE ACE_CDR::Boolean
 operator<< (ACE_OutputCDR &os, const ACE_CDR::Char *x)
 {
   os.write_string (x);
@@ -1292,6 +1341,12 @@ operator>> (ACE_InputCDR &is, ACE_CDR::Double &x)
 }
 
 ACE_INLINE ACE_CDR::Boolean
+operator>> (ACE_InputCDR &is, ACE_CDR::Fixed &x)
+{
+  return is.read_fixed (x) && is.good_bit ();
+}
+
+ACE_INLINE ACE_CDR::Boolean
 operator>> (ACE_InputCDR &is, ACE_CDR::Char *&x)
 {
   return is.read_string (x) && is.good_bit ();
@@ -1447,6 +1502,13 @@ ACE_OutputCDR::append_longdouble (ACE_InputCDR &stream)
 }
 
 ACE_INLINE ACE_CDR::Boolean
+ACE_OutputCDR::append_fixed (ACE_InputCDR &stream)
+{
+  ACE_CDR::Fixed x;
+  return stream.read_fixed (x) ? this->write_fixed (x) : false;
+}
+
+ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::append_string (ACE_InputCDR &stream)
 {
   ACE_CDR::Char *x = 0;
diff --git a/ACE/bin/.gitignore b/ACE/bin/.gitignore
index 1ac82dfd0ba..01ce0a68189 100644
--- a/ACE/bin/.gitignore
+++ b/ACE/bin/.gitignore
@@ -6,4 +6,5 @@
 /tao_logWalker
 /tao_nsadd
 /tao_nsdel
+/tao_nsgroup
 /tao_nslist
diff --git a/ACE/tests/CDR_Test.cpp b/ACE/tests/CDR_Test.cpp
index 0edc6ef47ff..cdb099b4c75 100644
--- a/ACE/tests/CDR_Test.cpp
+++ b/ACE/tests/CDR_Test.cpp
@@ -109,6 +109,7 @@ short_stream (void)
   ACE_CDR::ULong ul =  65800UL;
   ACE_CDR::Float f =  1.23f;
   ACE_CDR::Double d =  123.456789;
+  ACE_CDR::Fixed fx = ACE_CDR::Fixed::from_string ("8158901571290874");
 
   // Arrays for output
   ACE_CDR::Short s_array[3] = { -1, 0, 1 };
@@ -129,6 +130,7 @@ short_stream (void)
   os << ul;
   os << f;
   os << d;
+  os << fx;
   os.write_short_array (s_array, 3);
   os.write_long_array (l_array, 3);
   os.write_float_array (f_array, 3);
@@ -146,6 +148,7 @@ short_stream (void)
   ss << ul;
   ss << f;
   ss << d;
+  ss << fx;
   ss.write_short_array (s_array, 3);
   ss.write_long_array (l_array, 3);
   ss.write_float_array (f_array, 3);
@@ -198,6 +201,7 @@ short_stream (void)
   ACE_CDR::ULong ul1 = 0UL;
   ACE_CDR::Float f1 = 0.0f;
   ACE_CDR::Double d1 = 0.0;
+  ACE_CDR::Fixed fx1 = ACE_CDR::Fixed::from_string ("0");
 
   // Arrays for input
   ACE_CDR::Short s_array1[3];
@@ -224,6 +228,7 @@ short_stream (void)
   is >> ul1;
   is >> f1;
   is >> d1;
+  is >> fx1;
   is.read_short_array (s_array1, 3);
   is.read_long_array (l_array1, 3);
   is.read_float_array (f_array1, 3);
@@ -290,6 +295,12 @@ short_stream (void)
                        ACE_TEXT ("double transfer error")),
                       1);
 
+  if (fx1 != fx)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("fixed transfer error")),
+                      1);
+
   for (i = 0 ; i < 3; i++)
     if (s_array1[i] != s_array[i])
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor.cpp b/TAO/TAO_IDL/be/be_visitor.cpp
index 1377ed76eff..40fd097749b 100644
--- a/TAO/TAO_IDL/be/be_visitor.cpp
+++ b/TAO/TAO_IDL/be/be_visitor.cpp
@@ -14,6 +14,10 @@
 
 #include "be_visitor.h"
 
+#include "be_fixed.h"
+#include "global_extern.h"
+#include "utl_err.h"
+
 #include "ace/config-all.h"
 
 be_visitor::be_visitor (void)
@@ -331,7 +335,8 @@ be_visitor::visit_native (be_native *)
 }
 
 int
-be_visitor::visit_fixed (be_fixed *)
+be_visitor::visit_fixed (be_fixed *node)
 {
-  return 0;
+  idl_global->err ()->fixed_unsupported (node);
+  return 1;
 }
diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h
index a5ddb9d0482..da67239bfc1 100644
--- a/TAO/TAO_IDL/include/utl_err.h
+++ b/TAO/TAO_IDL/include/utl_err.h
@@ -72,6 +72,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 class AST_Decl;
 class AST_Interface;
 class AST_Enum;
+class AST_Fixed;
 class AST_Union;
 class AST_UnionLabel;
 class UTL_String;
@@ -149,6 +150,7 @@ public:
     EIDL_T_ARG_LENGTH,          // Wrong # of template args
     EIDL_MISMATCHED_SEQ_PARAM,  // 'sequence<T>' must match a previous param
     EIDL_TEMPLATE_NOT_ALIASED,  // ref to tmpl module scope must be via alias
+    EIDL_FIXED_UNSUPPORTED,     // fixed data type is not supported
     EIDL_OK                     // No error
   };
 
@@ -339,6 +341,9 @@ public:
   // Report not a type error
   void not_a_type (AST_Decl *d);
 
+  // Fixed data type is not supported
+  void fixed_unsupported (AST_Fixed *f);
+
   // Report back-end error
   void back_end (long lineno,
                  UTL_String *s);
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index e007a442103..1aab6296823 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -75,6 +75,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "ast_interface.h"
 #include "ast_enum.h"
+#include "ast_fixed.h"
 #include "ast_union.h"
 #include "ast_union_label.h"
 
@@ -232,6 +233,8 @@ error_string (UTL_Error::ErrorCode c)
       return "no match for identifier";
     case UTL_Error::EIDL_TEMPLATE_NOT_ALIASED:
       return "ref to template module scope must be via alias";
+    case UTL_Error::EIDL_FIXED_UNSUPPORTED:
+      return "fixed data types are not supported";
   }
 
   return 0;
@@ -1462,6 +1465,14 @@ UTL_Error::not_a_type (AST_Decl *d)
 }
 
 void
+UTL_Error::fixed_unsupported (AST_Fixed *d)
+{
+  idl_error_header (EIDL_FIXED_UNSUPPORTED, d->line (), d->file_name ());
+  ACE_ERROR ((LM_ERROR, "\n"));
+  idl_global->set_err_count (idl_global->err_count () + 1);
+}
+
+void
 UTL_Error::back_end (long lineno,
                      UTL_String *s)
 {
diff --git a/TAO/orbsvcs/Concurrency_Service/.gitignore b/TAO/orbsvcs/Concurrency_Service/.gitignore
index 855d1b4dbfd..3faa9a26270 100644
--- a/TAO/orbsvcs/Concurrency_Service/.gitignore
+++ b/TAO/orbsvcs/Concurrency_Service/.gitignore
@@ -1 +1,2 @@
 /Concurrency_Service
+/tao_cosconcurrency
diff --git a/TAO/orbsvcs/CosEvent_Service/.gitignore b/TAO/orbsvcs/CosEvent_Service/.gitignore
index 919e4f70796..8ccb4c79cc1 100644
--- a/TAO/orbsvcs/CosEvent_Service/.gitignore
+++ b/TAO/orbsvcs/CosEvent_Service/.gitignore
@@ -1 +1,2 @@
 /CosEvent_Service
+/tao_cosevent
diff --git a/TAO/orbsvcs/Dump_Schedule/.gitignore b/TAO/orbsvcs/Dump_Schedule/.gitignore
index aac9c18e789..10f0daac999 100644
--- a/TAO/orbsvcs/Dump_Schedule/.gitignore
+++ b/TAO/orbsvcs/Dump_Schedule/.gitignore
@@ -1 +1,2 @@
 /Dump_Schedule
+/tao_dump_schedule
diff --git a/TAO/orbsvcs/Event_Service/.gitignore b/TAO/orbsvcs/Event_Service/.gitignore
index ca11275e662..b31a8a898a7 100644
--- a/TAO/orbsvcs/Event_Service/.gitignore
+++ b/TAO/orbsvcs/Event_Service/.gitignore
@@ -1 +1,2 @@
 /Event_Service
+/tao_rtevent
diff --git a/TAO/orbsvcs/FT_Naming_Service/.gitignore b/TAO/orbsvcs/FT_Naming_Service/.gitignore
new file mode 100644
index 00000000000..09c97706244
--- /dev/null
+++ b/TAO/orbsvcs/FT_Naming_Service/.gitignore
@@ -0,0 +1 @@
+/tao_ft_naming
diff --git a/TAO/orbsvcs/FT_ReplicationManager/.gitignore b/TAO/orbsvcs/FT_ReplicationManager/.gitignore
index 99f6f513a78..d96aacf335f 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/.gitignore
+++ b/TAO/orbsvcs/FT_ReplicationManager/.gitignore
@@ -1 +1,2 @@
 /FT_ReplicationManager
+/tao_ft_replicationmanager
diff --git a/TAO/orbsvcs/Fault_Detector/.gitignore b/TAO/orbsvcs/Fault_Detector/.gitignore
index 29a747c48df..7e3218bb083 100644
--- a/TAO/orbsvcs/Fault_Detector/.gitignore
+++ b/TAO/orbsvcs/Fault_Detector/.gitignore
@@ -1 +1,2 @@
 /Fault_Detector
+/tao_fault_detector
diff --git a/TAO/orbsvcs/Fault_Notifier/.gitignore b/TAO/orbsvcs/Fault_Notifier/.gitignore
index 3c9c36bc943..12d3621a564 100644
--- a/TAO/orbsvcs/Fault_Notifier/.gitignore
+++ b/TAO/orbsvcs/Fault_Notifier/.gitignore
@@ -3,3 +3,4 @@
 /Debug
 /Fault_Notifier
 /Release
+/tao_fault_notifier
diff --git a/TAO/orbsvcs/IFR_Service/.gitignore b/TAO/orbsvcs/IFR_Service/.gitignore
index a36d7e5cde6..77de0ee6461 100644
--- a/TAO/orbsvcs/IFR_Service/.gitignore
+++ b/TAO/orbsvcs/IFR_Service/.gitignore
@@ -1,2 +1,3 @@
 /IFR_Service
 /tao_ifr
+/tao_ifr_service
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
index 2aad7a8ff2d..bccf3878e6f 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
@@ -1,5 +1,9 @@
 /* -*- c++ -*- */
 #include "ifr_visitor.h"
+
+#include "global_extern.h"
+#include "utl_err.h"
+
 #include "ace/Lock_Adapter_T.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Null_Mutex.h"
@@ -334,6 +338,13 @@ ifr_visitor::visit_native (AST_Native *)
   return 0;
 }
 
+int
+ifr_visitor::visit_fixed (AST_Fixed *node)
+{
+  idl_global->err ()->fixed_unsupported (node);
+  return 1;
+}
+
 ACE_Lock &
 ifr_visitor::lock (void) const
 {
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_visitor.h
index 6d517038cc0..e8d955df2e6 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.h
@@ -98,6 +98,9 @@ protected:
 private:
   /// Lock.
   ACE_Lock *lock_;
+
+  // Not supported, generate an error
+  int visit_fixed (AST_Fixed *node);
 };
 
 #endif /* TAO_IFR_VISITOR_H */
diff --git a/TAO/orbsvcs/LifeCycle_Service/.gitignore b/TAO/orbsvcs/LifeCycle_Service/.gitignore
index 9a62ef02772..7244d659a45 100644
--- a/TAO/orbsvcs/LifeCycle_Service/.gitignore
+++ b/TAO/orbsvcs/LifeCycle_Service/.gitignore
@@ -1 +1,2 @@
 /LifeCycle_Service
+/tao_coslifecycle
diff --git a/TAO/orbsvcs/LoadBalancer/.gitignore b/TAO/orbsvcs/LoadBalancer/.gitignore
index 7613b3c0c32..05294227862 100644
--- a/TAO/orbsvcs/LoadBalancer/.gitignore
+++ b/TAO/orbsvcs/LoadBalancer/.gitignore
@@ -1,2 +1,4 @@
 /LoadManager
 /LoadMonitor
+/tao_loadmanager
+/tao_loadmonitor
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/.gitignore b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/.gitignore
index 9683a543950..0b389ea38b5 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/.gitignore
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/.gitignore
@@ -1 +1,2 @@
 /Basic_Logging_Service
+/tao_tls_basic
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/.gitignore b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/.gitignore
index 48d0264a886..62d37fae41e 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/.gitignore
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/.gitignore
@@ -1 +1,2 @@
 /Event_Logging_Service
+/tao_tls_event
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/.gitignore b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/.gitignore
index fed6d1fa80f..894e326d37c 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/.gitignore
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/.gitignore
@@ -1 +1,2 @@
 /Notify_Logging_Service
+/tao_tls_notify
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/.gitignore b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/.gitignore
index 38e7067bdc9..01ecd259113 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/.gitignore
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/.gitignore
@@ -1 +1,2 @@
 /RTEvent_Logging_Service
+/tao_tls_rtevent
diff --git a/TAO/orbsvcs/Notify_Service/.gitignore b/TAO/orbsvcs/Notify_Service/.gitignore
index 8bbad4f650a..aba51782537 100644
--- a/TAO/orbsvcs/Notify_Service/.gitignore
+++ b/TAO/orbsvcs/Notify_Service/.gitignore
@@ -1,2 +1,3 @@
-/NT_Notify_Service
 /Notify_Service
+/NT_Notify_Service
+/tao_cosnotification
diff --git a/TAO/orbsvcs/Scheduling_Service/.gitignore b/TAO/orbsvcs/Scheduling_Service/.gitignore
index f131db96c60..3fa7516eb77 100644
--- a/TAO/orbsvcs/Scheduling_Service/.gitignore
+++ b/TAO/orbsvcs/Scheduling_Service/.gitignore
@@ -1 +1,2 @@
 /Scheduling_Service
+/tao_cosscheduling
diff --git a/TAO/orbsvcs/TAO_Service/.gitignore b/TAO/orbsvcs/TAO_Service/.gitignore
index ae91dcdf9ab..4ab0ff0c4a2 100644
--- a/TAO/orbsvcs/TAO_Service/.gitignore
+++ b/TAO/orbsvcs/TAO_Service/.gitignore
@@ -1 +1,2 @@
 /TAO_Service
+/tao_service
diff --git a/TAO/orbsvcs/Time_Service/.gitignore b/TAO/orbsvcs/Time_Service/.gitignore
index bb9dd9bcc60..51268bc8210 100644
--- a/TAO/orbsvcs/Time_Service/.gitignore
+++ b/TAO/orbsvcs/Time_Service/.gitignore
@@ -1,2 +1,4 @@
+/tao_costime_clerk
+/tao_costime_server
 /Time_Service_Clerk
 /Time_Service_Server
diff --git a/TAO/orbsvcs/Trading_Service/.gitignore b/TAO/orbsvcs/Trading_Service/.gitignore
index 213606985b1..d3254f3a7af 100644
--- a/TAO/orbsvcs/Trading_Service/.gitignore
+++ b/TAO/orbsvcs/Trading_Service/.gitignore
@@ -1 +1,2 @@
+/tao_costrading
 /Trading_Service
diff --git a/TAO/orbsvcs/orbsvcs/.gitignore b/TAO/orbsvcs/orbsvcs/.gitignore
index 0d7dcc693c7..54a2960f6e7 100644
--- a/TAO/orbsvcs/orbsvcs/.gitignore
+++ b/TAO/orbsvcs/orbsvcs/.gitignore
@@ -303,6 +303,10 @@
 /sfpC.inl
 /sfpS.cpp
 /sfpS.h
+/SSLIOPC.cpp
+/SSLIOPC.h
+/SSLIOPC.inl
+/SSLIOPS.h
 /TimeBaseC.cpp
 /TimeBaseC.h
 /TimeBaseC.inl
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/.gitignore b/TAO/orbsvcs/orbsvcs/SSLIOP/.gitignore
new file mode 100644
index 00000000000..427760957f7
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/.gitignore
@@ -0,0 +1,3 @@
+/ssl_endpointsC.cpp
+/ssl_endpointsC.h
+/ssl_endpointsS.h
diff --git a/TAO/utils/nsgroup/.gitignore b/TAO/utils/nsgroup/.gitignore
new file mode 100644
index 00000000000..916db82b9a5
--- /dev/null
+++ b/TAO/utils/nsgroup/.gitignore
@@ -0,0 +1 @@
+/tao_nsgroup