ChangeLogTag:Thu Nov 4 08:36:34 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>

6 files changed, 47 insertions, 6 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 82bf24ba323..667d4d386db 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,14 @@
+Thu Nov  4 08:36:34 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/Memory_Pool: Moved the sync() and protect() methods
+	  from ACE_Pagefile_Memory_Pool into the *.i file and made their
+ 	  parameter names anonymous since these methods are no-ops.
+  	  Thanks to Martin Krumpolec <krumpo@pobox.sk> for suggesting
+ 	  this.
+
+	* include/makeinclude/compiler.bor: Changed MISC_CFLAGS
+	  to -a8 -b- -Ve -Vx.  Thanks to Jody Hagins for this suggestion.
+
 Thu Nov 04 15:19:54 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * ACE version 5.0.8 released.
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index e61fed3a02d..48397985fb9 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,10 @@
+Thu Nov  4 09:10:58 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* tao/Active_Object_Map.h: Added TAO_Export to
+	  TAO_Active_Object_Map so that it can be exported.  Thanks to
+ 	  Lothar Werzinger <werzinger.lothar@krones.de> for suggesting
+ 	  this.
+
 Thu Nov  4 18:30:19 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
 	* tests/Endoint_Per_Priority/Endpoint_Per_Priority.dsw:
diff --git a/TAO/tao/Active_Object_Map.h b/TAO/tao/Active_Object_Map.h
index b33613a59ce..7545c612356 100644
--- a/TAO/tao/Active_Object_Map.h
+++ b/TAO/tao/Active_Object_Map.h
@@ -31,7 +31,7 @@ class TAO_Lifespan_Strategy;
 class TAO_Id_Assignment_Strategy;
 class TAO_Id_Hint_Strategy;
 
-class TAO_Active_Object_Map
+class TAO_Export TAO_Active_Object_Map
 {
   // = TITLE
   //     Map of object ids to servants.
diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h
index 2cfadafacc3..a8933fdcd7e 100644
--- a/ace/Memory_Pool.h
+++ b/ace/Memory_Pool.h
@@ -571,10 +571,10 @@ public:
   // Round up to the chunk size required by the operation system
 
   // = Don't need this methods here ...
-  int sync (ssize_t len = -1, int flags = MS_SYNC) { return 0; }
-  int sync (void *addr, size_t len, int flags = MS_SYNC) { return 0; }
-  int protect (ssize_t len = -1, int prot = PROT_RDWR) { return 0; };
-  int protect (void *addr, size_t len, int prot = PROT_RDWR) { return 0; }
+  int sync (ssize_t = -1, int = MS_SYNC);
+  int sync (void *, size_t, int = MS_SYNC);
+  int protect (ssize_t = -1, int = PROT_RDWR);
+  int protect (void *, size_t, int = PROT_RDWR);
   void dump (void) const {}
 
 protected:
diff --git a/ace/Memory_Pool.i b/ace/Memory_Pool.i
index 1bb57ac2f7f..4372a9c1601 100644
--- a/ace/Memory_Pool.i
+++ b/ace/Memory_Pool.i
@@ -209,4 +209,27 @@ ACE_Pagefile_Memory_Pool::round_to_page_size (size_t nbytes)
   return ACE::round_to_pagesize (nbytes);
 }
 
+ACE_INLINE int
+ACE_Pagefile_Memory_Pool::sync (ssize_t = -1, int = MS_SYNC) 
+{ 
+  return 0; 
+}
+
+ACE_INLINE int 
+ACE_Pagefile_Memory_Pool::sync (void *, size_t, int = MS_SYNC) 
+{ 
+  return 0; 
+}
+
+ACE_INLINE int 
+ACE_Pagefile_Memory_Pool::protect (ssize_t = -1, int = PROT_RDWR) 
+{ 
+  return 0; 
+}
+
+ACE_INLINE int 
+ACE_Pagefile_Memory_Pool::protect (void *, size_t, int = PROT_RDWR) 
+{ 
+  return 0; 
+}
 #endif /* ACE_WIN32 */
diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor
index 24cae748a23..9dc2556403d 100644
--- a/include/makeinclude/compiler.bor
+++ b/include/makeinclude/compiler.bor
@@ -63,7 +63,7 @@ THREAD_CFLAGS = -D_MT -tWM
 WARNINGS_CFLAGS = -w-rvl -w-rch -w-par -w-ccc -w-obs -w-aus -w-pia
 DEFINES_CFLAGS = -DWIN32;_NO_VCL
 QUIET_CFLAGS = -q
-MISC_CFLAGS = -a8
+MISC_CFLAGS = -a8 -b- -Ve -Vx
 
 COMMON_CFLAGS = $(QUIET_CFLAGS) $(DEBUG_CFLAGS) $(THREAD_CFLAGS) \
 	$(STATIC_CFLAGS) $(WARNINGS_CFLAGS) $(DEFINES_CFLAGS) \