Changeset 164

Timestamp:

1999-02-22T11:33:54+13:00 (25 years ago)

Author:

rjmcnab

Message:

Lots of stuff :-)

Location:

trunk/gsdl/src/recpt

Files:

• converter.cpp (modified) (3 diffs)
• converter.h (modified) (3 diffs)

trunk/gsdl/src/recpt/converter.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.2  1999/02/21 22:33:54  rjmcnab
+   Lots of stuff :-)
+
    Revision 1.1  1999/02/05 10:42:45  rjmcnab
 
@@ -24 +27 @@
 
 // the converters within converterinfo become the property of
-// of this class after add_converter has been called. They should
-// be allocated with new but not explicitly destroyed (they will
-// be destroyed when this class is destroyed).
+// of this class after add_converter has been called. The converters
+// remain the responsability of the calling code and will not be
+// deleted by this class.
 void convertinfoclass::add_converter (const text_t &name, inconvertclass *inconverter,
                       rzwsoutconvertclass *outconverter) {
   // can't add a null converter or an action with no name
   if (inconverter == NULL || outconverter == NULL || name.empty()) {
-    if (inconverter != NULL) delete inconverter;
-    if (outconverter != NULL) delete outconverter;
     return;
   }
@@ -41 +42 @@
   info.outconverter = outconverter;
   converters[name] = info;
-  info.inconverter = NULL;  // ownership has changed
-  info.outconverter = NULL; // ownership has changed
 }
 

trunk/gsdl/src/recpt/converter.h

@@ -28 +28 @@
 
 
+// inconverter and outconverter ARE NOT destroyed by this class
+// they should be destroyed by the code which created them after
+// no more pointers to the class exist.
+//
+// The above condition enables the class to be copied without
+// copying the converters which might contain a lot of data (and
+// be of an unknown derived type).
 class converterinfo {
 public:
@@ -35 +42 @@
 
   converterinfo() {inconverter=NULL; outconverter=NULL;}
-  ~converterinfo() {
-    if (inconverter!=NULL) {
-      delete inconverter;
-      inconverter=NULL;
-    }
-    if (outconverter!=NULL) {
-      delete outconverter;
-      outconverter=NULL;
-    }
-  }
 };
 
@@ -90 +87 @@
 
   // the converters within converterinfo become the property of
-  // of this class after add_converter has been called. They should
-  // be allocated with new but not explicitly destroyed (they will
-  // be destroyed when this class is destroyed).
+  // of this class after add_converter has been called. The converters
+  // remain the responsability of the calling code and will not be
+  // deleted by this class.
   void add_converter (const text_t &name, inconvertclass *inconverter,
               rzwsoutconvertclass *outconverter);