ChangeLogTag:Fri May 9 10:17:11 2003 Ossama Othman <ossama@dre.vanderbilt.edu>

2 files changed, 56 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 8076db650a1..e0527016638 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri May  9 10:17:11 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* bin/fuzz.pl (check_for_ptr_arith_t):
+
+	  New check for ptr_arith_t usage in source files.  Steve Huston
+	  points out that we should be using the portable/standard
+	  ptrdiff_t type instead.
+
 Fri May  9 12:12:51 2003  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/modules/ProjectCreator.pm:
@@ -101,10 +109,17 @@ Wed May  7 18:32:45 2003  Steve Huston  <shuston@riverace.com>
 
 Wed May  7 17:02:44 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
+<<<<<<< ChangeLog
+	* bin/MakeProjectCreator/config/ciao_component.mpb: Added the
+	  required libraries to build the server. This was necessitated by
+	  the recent subsetting in TAO.
+
+=======
         * bin/MakeProjectCreator/config/ciao_component.mpb: Added the
           required libraries to build the server. This was necessitated by
           the recent subsetting in TAO.
 
+>>>>>>> 4.5036
 Wed May  7 17:25:49 2003  Steve Huston  <shuston@riverace.com>
 
         * ace/Service_Config.h: Added description of the -s option to
@@ -117,10 +132,17 @@ Wed May  7 14:00:31 2003  Steve Huston  <shuston@riverace.com>
 
 Wed May  7 12:03:28 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
+<<<<<<< ChangeLog
+	* bin/topinfo_iorsize_stats.sh (FILES): Removed the memory
+	  tracking on the client side since its of no use. Added code to
+	  collect the actual size of the server growth once data is
+	  marshalled.
+=======
         * bin/topinfo_iorsize_stats.sh (FILES): Removed the memory
           tracking on the client side since its of no use. Added code to
           collect the actual size of the server growth once data is
           marshalled.
+>>>>>>> 4.5036
 
         * bin/generate_topinfo_stats.sh: Used the 4th argument to plot
           information on the y axis.
diff --git a/bin/fuzz.pl b/bin/fuzz.pl
index 12f78495dbf..537603126b4 100755
--- a/bin/fuzz.pl
+++ b/bin/fuzz.pl
@@ -847,6 +847,39 @@ sub check_for_changelog_errors ()
     }
 }
 
+# This test checks for ptr_arith_t usage in source code.  ptr_arith_t
+# is non-portable.  Use ptrdiff_t instead.
+sub check_for_ptr_arith_t ()
+{
+    print "Running ptr_arith_t check\n";
+    foreach $file (@files_cpp, @files_inl, @files_h) {
+        my $line = 0;
+        if (open (FILE, $file)) {
+
+            print "Looking at file $file\n" if $opt_d;
+            while (<FILE>) {
+                ++$line;
+
+                next if m/^\s*\/\//;  # Ignore C++ comments.
+                next if m/^\s*$/;     # Skip lines only containing
+                                      # whitespace.
+
+		# Check for ptr_arith_t usage.  This test should
+		# ignore typedefs, and should only catch variable
+		# declarations and parameter types.
+                if (m/ptr_arith_t / || m/ptr_arith_t,/) {
+                    print_error ("ptr_arith_t in $file ($line)."
+				 . "  Use ptrdiff_t instead.");
+                }
+            }
+            close (FILE);
+        }
+        else {
+            print STDERR "Error: Could not open $file\n";
+        }
+    }
+}
+
 ##############################################################################
 
 use vars qw/$opt_c $opt_d $opt_h $opt_l $opt_m $opt_v/;
@@ -899,6 +932,7 @@ check_for_bad_ace_trace () if ($opt_l >= 4);
 check_for_missing_rir_env () if ($opt_l >= 5);
 check_for_ace_check () if ($opt_l >= 3);
 check_for_changelog_errors () if ($opt_l >= 4);
+check_for_ptr_arith_t () if ($opt_l >= 4);
 
 print "\nFuzz.pl - $errors error(s), $warnings warning(s)\n";