summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornw1 <nw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-07-04 01:37:50 +0000
committernw1 <nw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-07-04 01:37:50 +0000
commit3ce34cf6c041852b020043ffa0f1513529b44e1a (patch)
treee282a88e3d57283a7923baf1d63fe2127ffb47fe
parent349280f9245019514b05d5bb387a27091b2db14c (diff)
downloadATCD-3ce34cf6c041852b020043ffa0f1513529b44e1a.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog-97a6
-rw-r--r--performance-tests/Misc/childbirth_time.cpp14
2 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog-97a b/ChangeLog-97a
index 83f293b2fc7..3cba0220382 100644
--- a/ChangeLog-97a
+++ b/ChangeLog-97a
@@ -1,3 +1,9 @@
+Thu Jul 3 20:36:19 1997 Nanbor Wang <nw1@cumbia.cs.wustl.edu>
+
+ * performance-tests/Misc/childbirth_time.cpp: Changed the
+ parameter type of "Profiler" from int to size_t to make g++
+ happy.
+
Thu Jul 03 20:03:18 1997 David L. Levine <levine@cs.wustl.edu>
* ace/Reactor.cpp (remove_handler): added ACE_UNUSED_ARG
diff --git a/performance-tests/Misc/childbirth_time.cpp b/performance-tests/Misc/childbirth_time.cpp
index 31447b04e69..7d11e2ae5b4 100644
--- a/performance-tests/Misc/childbirth_time.cpp
+++ b/performance-tests/Misc/childbirth_time.cpp
@@ -66,7 +66,7 @@
#endif
const int MULTIPLY_FACTOR = 10;
-typedef double (*Profiler)(int);
+typedef double (*Profiler)(size_t);
static int do_exec_after_fork = 0;
static void *
@@ -76,7 +76,7 @@ empty (void*) // do nothing thread function
}
static double
-prof_ace_process (int iteration)
+prof_ace_process (size_t iteration)
{
if (iteration != 0)
{
@@ -119,7 +119,7 @@ prof_ace_process (int iteration)
}
static double
-prof_fork (int iteration)
+prof_fork (size_t iteration)
{
#if !defined (ACE_LACKS_EXEC)
if (iteration != 0)
@@ -157,7 +157,7 @@ prof_fork (int iteration)
}
static double
-prof_native_thread (int iteration)
+prof_native_thread (size_t iteration)
{
#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WTHREADS) || defined (ACE_HAS_STHREADS))
if (iteration != 0)
@@ -203,7 +203,7 @@ prof_native_thread (int iteration)
}
static double
-prof_ace_os_thread (int iteration)
+prof_ace_os_thread (size_t iteration)
{
#if defined (ACE_HAS_THREADS)
if (iteration != 0)
@@ -242,7 +242,7 @@ main (int argc, char* argv[])
{
ACE_Get_Opt get_opt (argc, argv, "n:pftahe");
int c;
- int iteration = 10;
+ size_t iteration = 10;
Profiler profiler = 0;
char *profile_name = 0 ;
@@ -292,5 +292,3 @@ main (int argc, char* argv[])
}
return 0;
}
-
-