Changeset 22141 for main/trunk/greenstone2/common-src/src

Timestamp:

2010-05-20T20:51:21+12:00 (14 years ago)

Author:

davidb

Message:

Was surprised to discover some classes that did not correctly specify virtual on its destructor, even though virutal was being used on other methods in the class, or else through inheritance. Now fixed up.

Location:

main/trunk/greenstone2/common-src/src/lib

Files:

• gsdlunicode.cpp (modified) (1 diff)
• gsdlunicode.h (modified) (4 diffs)
• text_t.cpp (modified) (3 diffs)
• text_t.h (modified) (3 diffs)

main/trunk/greenstone2/common-src/src/lib/gsdlunicode.cpp

@@ -127 +127 @@
 }
 
+utf8inconvertclass::~utf8inconvertclass () {
+  // nothing to do
+}
+
 void utf8inconvertclass::reset () {
   start = NULL;

main/trunk/greenstone2/common-src/src/lib/gsdlunicode.h

@@ -46 +46 @@
 public:
   utf8inconvertclass();
-  void reset ();
-  void convert (text_t &output, status_t &status);
+  virtual ~utf8inconvertclass();
+
+  virtual void reset ();
+  virtual void convert (text_t &output, status_t &status);
 
 protected:
@@ -70 +72 @@
 public:
   rzwsoutconvertclass () {rzws = 0;};
+  virtual ~rzwsoutconvertclass () {};
+
   void set_rzws (int new_rzws) {rzws = new_rzws;};
 
@@ -80 +84 @@
 public:
   utf16outconvertclass () {};
-  void convert (char *out, size_t maxlen, size_t &len, status_t &status);
+  virtual ~utf16outconvertclass () {};
+
+  virtual void convert (char *out, size_t maxlen, size_t &len, status_t &status);
 };
 
@@ -88 +94 @@
 public:
   utf8outconvertclass () {utf8buflen=0; utf8bufhere=0;};
-  void reset ();
+  virtual ~utf8outconvertclass () {};
+
+  virtual void reset ();
   // note that convert does not null-terminate the
   // output array of characters

main/trunk/greenstone2/common-src/src/lib/text_t.cpp

@@ -724 +724 @@
 }
 
+convertclass::~convertclass () 
+{
+  // nothing to do
+}
+
 void convertclass::reset ()
 {
@@ -742 +747 @@
   start = NULL;
   len = 0;
+}
+
+inconvertclass::~inconvertclass () 
+{
+  // nothing to do
 }
 
@@ -845 +855 @@
 }
 
+outconvertclass::~outconvertclass () 
+{
+  // nothing to do
+}
+
+
 void outconvertclass::reset ()
 {

main/trunk/greenstone2/common-src/src/lib/text_t.h

@@ -298 +298 @@
   
   convertclass ();
+  virtual ~convertclass ();
   virtual void reset ();
 };
@@ -310 +311 @@
 public:
   inconvertclass ();
-  void reset ();
+  ~inconvertclass ();
+
+  virtual void reset ();
   void setinput (char *thestart, size_t thelen);
 
@@ -351 +354 @@
 public:
   outconvertclass ();
+  ~outconvertclass ();
+
   virtual void reset ();
   virtual void setinput (text_t *theinput);