summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1999-06-14 14:47:43 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1999-06-14 14:47:43 +0000
commitcdfa37f75de2b1780d6f11d899e5af1cab7adf6b (patch)
tree3fa68f545d0e821fc82e24ded80a04a23da748e3
parent74d03a485649a0e5be283ce0c3d8906ed0c904da (diff)
downloadATCD-cdfa37f75de2b1780d6f11d899e5af1cab7adf6b.tar.gz
*** empty log message ***
-rw-r--r--TAO/ChangeLog-99c32
-rw-r--r--ace/OS.h1
2 files changed, 16 insertions, 17 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 067b1422144..8f361d8d102 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -112,12 +112,12 @@ Sun Jun 13 23:38:02 1999 Nanbor Wang <nanbor@cs.wustl.edu>
Sun Jun 13 23:29:22 1999 Marina Spivak <marina@cs.wustl.edu>
* orbsvcs/orbsvcs/Naming/Transient_Naming_Context.{h,cpp}
- * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.{h,cpp}
- Added the above files.
+ * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.{h,cpp}: Added the
+ above files.
* orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.{h,cpp}
- * orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.{h,cpp}
- Removed the above files.
+ * orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.{h,cpp}:
+ Removed the above files.
* orbsvcs/orbsvcs/Naming/Naming_Context.{h,cpp}
* orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.{h,cpp}
@@ -125,19 +125,17 @@ Sun Jun 13 23:29:22 1999 Marina Spivak <marina@cs.wustl.edu>
* orbsvcs/orbsvcs/Naming/Hash_Naming_Context.{h,cpp}
* orbsvcs/orbsvcs/Naming/Naming_Utils.{h,cpp}
* orbsvcs/orbsvcs/Naming/Entries.{h,cpp}
- * orbsvcs/orbsvcs/Naming/Persistent_Entries.{h,cpp}
- Modified the above files.
-
- Restructured the implementation of NamingContext to factor out the
- common code between persistent and nonpersistent implementations
- through the Template method pattern (added
- TAO_Transient_Naming_Context, TAO_Bindings_Map,
- TAO_Transient_Bindings_Map classes and modified others). Made
- TAO_Persistent_Context_Index a non-template class, and
- TAO_Bindings_Iterator a template class. Made a pass through some
- files for code review - added comments. Got rid of the use of
- <create_servant_lock> method, and changed lock pointers to lock
- references. Many other minor adjustments...
+ * orbsvcs/orbsvcs/Naming/Persistent_Entries.{h,cpp}:
+ Modified the above files. Restructured the implementation of
+ NamingContext to factor out the common code between persistent
+ and nonpersistent implementations through the Template method
+ pattern (added TAO_Transient_Naming_Context, TAO_Bindings_Map,
+ TAO_Transient_Bindings_Map classes and modified others). Made
+ TAO_Persistent_Context_Index a non-template class, and
+ TAO_Bindings_Iterator a template class. Made a pass through
+ some files for code review - added comments. Got rid of the use
+ of <create_servant_lock> method, and changed lock pointers to
+ lock references. Many other minor adjustments...
Sun Jun 13 22:39:51 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
diff --git a/ace/OS.h b/ace/OS.h
index b9403efb2cb..4ce038d964a 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -5447,6 +5447,7 @@ public:
static int ioctl (ACE_HANDLE handle,
int cmd,
void * = 0);
+ // UNIX-style <ioctl>.
static int ioctl (ACE_HANDLE socket,
u_long io_control_code,
void *in_buffer_p,