diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-04-20 17:01:54 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-04-20 17:01:54 +0000 |
commit | 46f47d12e434065f8aba2a7ebbadfe58f1c1a251 (patch) | |
tree | a50a2a66c881410dd6858ea503a46929262f6d12 | |
parent | 2c6442e2e31dd9fffee6c4a1b0c05b9eb490da4c (diff) | |
download | ATCD-46f47d12e434065f8aba2a7ebbadfe58f1c1a251.tar.gz |
ChangeLogTag:Wed Apr 20 12:51:17 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
-rw-r--r-- | ChangeLog | 13 | ||||
-rw-r--r-- | ace/Cleanup_Strategies_T.cpp | 7 | ||||
-rw-r--r-- | ace/Cleanup_Strategies_T.h | 3 | ||||
-rw-r--r-- | apps/Gateway/Gateway/File_Parser.cpp | 12 | ||||
-rw-r--r-- | apps/Gateway/Gateway/File_Parser.h | 4 | ||||
-rw-r--r-- | examples/Web_Crawler/URL_Visitor.cpp | 12 | ||||
-rw-r--r-- | examples/Web_Crawler/URL_Visitor.h | 8 | ||||
-rw-r--r-- | examples/Web_Crawler/URL_Visitor_Factory.cpp | 9 | ||||
-rw-r--r-- | examples/Web_Crawler/URL_Visitor_Factory.h | 4 |
9 files changed, 62 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 8612e59752a..f3abb9410e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Wed Apr 20 12:51:17 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * ace/Cleanup_Strategies_T.cpp: + * ace/Cleanup_Strategies_T.h: + * apps/Gateway/Gateway/File_Parser.h: + * apps/Gateway/Gateway/File_Parser.cpp: + * examples/Web_Crawler/URL_Visitor.cpp: + * examples/Web_Crawler/URL_Visitor.h: + * examples/Web_Crawler/URL_Visitor_Factory.cpp: + * examples/Web_Crawler/URL_Visitor_Factory.h: + + Added virtual destructors to address g++ 4.0 warnings. + Wed Apr 20 07:15:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tests/ACE_Test.cpp: diff --git a/ace/Cleanup_Strategies_T.cpp b/ace/Cleanup_Strategies_T.cpp index 84b20f9035a..3e74df76c03 100644 --- a/ace/Cleanup_Strategies_T.cpp +++ b/ace/Cleanup_Strategies_T.cpp @@ -9,10 +9,13 @@ #define ACE_LACKS_PRAGMA_ONCE #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_RCSID(ace, Cleanup_Strategies_T, "$Id$") - //////////////////////////////////////////////////////////////////////////// +template <class KEY, class VALUE, class CONTAINER> +ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::~ACE_Cleanup_Strategy (void) +{ +} + template <class KEY, class VALUE, class CONTAINER> int ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, KEY *key, diff --git a/ace/Cleanup_Strategies_T.h b/ace/Cleanup_Strategies_T.h index cc85957f50c..989b6a2c629 100644 --- a/ace/Cleanup_Strategies_T.h +++ b/ace/Cleanup_Strategies_T.h @@ -39,6 +39,9 @@ class ACE_Cleanup_Strategy public: + /// Destructor. + virtual ~ACE_Cleanup_Strategy (void); + /// The method which will do the cleanup of the entry in the container. virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value); }; diff --git a/apps/Gateway/Gateway/File_Parser.cpp b/apps/Gateway/Gateway/File_Parser.cpp index 20e29990ea8..de82ad0ba10 100644 --- a/apps/Gateway/Gateway/File_Parser.cpp +++ b/apps/Gateway/Gateway/File_Parser.cpp @@ -1,26 +1,24 @@ // $Id$ #ifndef FILE_PARSER_C - #define FILE_PARSER_C #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_stdlib.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - #include "File_Parser.h" -ACE_RCSID(Gateway, File_Parser, "$Id$") - // This fixes a nasty bug with cfront-based compilers (like // Centerline). typedef FP::Return_Type FP_RETURN_TYPE; // File_Parser stuff. +template <class ENTRY> +File_Parser<ENTRY>::~File_Parser (void) +{ +} + template <class ENTRY> int File_Parser<ENTRY>::open (const ACE_TCHAR filename[]) { diff --git a/apps/Gateway/Gateway/File_Parser.h b/apps/Gateway/Gateway/File_Parser.h index 1e8dd264809..6e971090ad8 100644 --- a/apps/Gateway/Gateway/File_Parser.h +++ b/apps/Gateway/Gateway/File_Parser.h @@ -46,6 +46,10 @@ class File_Parser // Class used to parse the configuration file for the // <Consumer_Map>. public: + + /// Destructor. + virtual ~File_Parser (void); + // = Open and Close the file specified int open (const ACE_TCHAR filename[]); int close (void); diff --git a/examples/Web_Crawler/URL_Visitor.cpp b/examples/Web_Crawler/URL_Visitor.cpp index 2ad46d42eac..6f2b5dbeeb4 100644 --- a/examples/Web_Crawler/URL_Visitor.cpp +++ b/examples/Web_Crawler/URL_Visitor.cpp @@ -13,6 +13,10 @@ URL_Processing_Strategy::URL_Processing_Strategy (URL &url, { } +URL_Processing_Strategy::~URL_Processing_Strategy (void) +{ +} + int URL_Processing_Strategy::destroy (void) { @@ -229,6 +233,10 @@ URL_Validation_Visitation_Strategy_Factory::destroy (void) return 0; } +URL_Visitor::~URL_Visitor (void) +{ +} + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) // The explicit instantiations are necessary with g++ 2.91.66 @@ -602,6 +610,10 @@ URL_Visitation_Strategy_Factory::URL_Visitation_Strategy_Factory (URL *url) { } +URL_Visitation_Strategy_Factory::~URL_Visitation_Strategy_Factory (void) +{ +} + URL_Download_Visitation_Strategy_Factory::URL_Download_Visitation_Strategy_Factory (URL *url) : URL_Visitation_Strategy_Factory (url) { diff --git a/examples/Web_Crawler/URL_Visitor.h b/examples/Web_Crawler/URL_Visitor.h index 63d856e9bd7..9f68612d629 100644 --- a/examples/Web_Crawler/URL_Visitor.h +++ b/examples/Web_Crawler/URL_Visitor.h @@ -47,6 +47,8 @@ public: URL_Iterator &); // Constructor. + virtual ~URL_Processing_Strategy (void); + virtual int execute (void) = 0; // Perform the strategy. @@ -126,6 +128,9 @@ class URL_Visitation_Strategy_Factory public: URL_Visitation_Strategy_Factory (URL *); + /// Destructor. + virtual ~URL_Visitation_Strategy_Factory (void); + // = Factory Methods. virtual URL_Iterator *make_header_iterator (void) = 0; // Factory Method that makes the header iterator. @@ -214,6 +219,9 @@ class URL_Visitor // = DESCRIPTION // This class plays the "visitor" role in the Visitor pattern. public: + + virtual ~URL_Visitor (void); + virtual int visit (HTTP_URL &http_url) = 0; // Visit an <HTTP_URL>. diff --git a/examples/Web_Crawler/URL_Visitor_Factory.cpp b/examples/Web_Crawler/URL_Visitor_Factory.cpp index aaf30db0460..c92f6240bb8 100644 --- a/examples/Web_Crawler/URL_Visitor_Factory.cpp +++ b/examples/Web_Crawler/URL_Visitor_Factory.cpp @@ -3,7 +3,14 @@ #include "URL_Visitor_Factory.h" -ACE_RCSID(Web_Crawler, URL_Visitor_Factory, "$Id$") +ACE_RCSID (Web_Crawler, + URL_Visitor_Factory, + "$Id$") + + +URL_Visitor_Factory::~URL_Visitor_Factory (void) +{ +} URL_Visitor * URL_Validation_Visitor_Factory::make_visitor (void) diff --git a/examples/Web_Crawler/URL_Visitor_Factory.h b/examples/Web_Crawler/URL_Visitor_Factory.h index 333fa9f0e66..11018f73a23 100644 --- a/examples/Web_Crawler/URL_Visitor_Factory.h +++ b/examples/Web_Crawler/URL_Visitor_Factory.h @@ -33,6 +33,10 @@ class URL_Visitor_Factory // Subclasses define each of the Factory Methods to // make the right objects, which all "vary" together. public: + + /// Destructor. + virtual ~URL_Visitor_Factory (void); + virtual URL_Visitor *make_visitor (void) = 0; // Factory Method that makes the appropriate type of <URL_Visitor>. |