Thu Sep 29 13:28:29 2005 Chris Cleeland <cleeland_c@ociweb.com>

2 files changed, 38 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 6f2d14acaea..5eba3d68402 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Sep 29 13:28:29 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+	* bin/fuzz.pl (check_for_refcountservantbase):
+
+	  Added a new fuzz check to catch derivations to
+	  PortableServer::RefCountServantBase.  Obviously, this check only
+	  applied to TAO, and the test itself isn't very discriminating as
+	  it simply looks for the presence of
+	  "PortableServer::RefCountServantBase" in a file and doesn't
+	  attempt to detect derivation.  There are also no means to turn
+	  off the check in comments.  But it's better than nothing.
+
 Thu Sep 29 15:18:24 2005  Simon McQueen  <sm@prismtech.com>
 
         * bin/tao_other_tests.lst:
diff --git a/bin/fuzz.pl b/bin/fuzz.pl
index 93e36866377..3af7cabc9a3 100755
--- a/bin/fuzz.pl
+++ b/bin/fuzz.pl
@@ -1295,6 +1295,29 @@ sub check_for_long_file_names ()
     }
 }
 
+sub check_for_refcountservantbase ()
+{
+    print "Running PortableServer::RefCountServantBase derivation check\n";
+
+    foreach $file (@files_h) {
+        my $line = 0;
+        if (open (FILE, $file)) {
+            print "Looking at file $file\n" if $opt_d;
+            while (<FILE>) {
+                ++$line;
+
+                if (/PortableServer::RefCountServantBase/) {
+                  print_error ("$file:$line: reference to deprecated PortableServer::RefCountServantBase");
+                }
+            }
+            close (FILE);
+        }
+        else {
+            print STDERR "Error: Could not open $file\n";
+        }
+    }
+}
+
 ##############################################################################
 
 use vars qw/$opt_c $opt_d $opt_h $opt_l $opt_t $opt_m $opt_v/;
@@ -1337,7 +1360,8 @@ if (!getopts ('cdhl:t:mv') || $opt_h) {
            check_for_ptr_arith_t
            check_for_include
            check_for_non_bool_operators
-           check_for_long_file_names\n";
+           check_for_long_file_names
+           check_for_refcountservantbase\n";
     exit (1);
 }
 
@@ -1365,6 +1389,7 @@ if ($opt_t) {
 print "--------------------Configuration: Fuzz - Level ",$opt_l,
       "--------------------\n";
 
+check_for_refcountservantbase () if ($opt_l > 1 );
 check_for_msc_ver_string () if ($opt_l >= 3);
 check_for_empty_inline_files () if ($opt_l >= 1);
 check_for_noncvs_files () if ($opt_l >= 1);