Fix a bug in cloud texture state loading which caused the cloud textures to

[simgear.git] / simgear / timing / timezone.h

diff --git a/simgear/timing/timezone.h b/simgear/timing/timezone.h
index ce3521befaaa0b548a9dce79746eb97d55186efa..5d3035d5b8f16637662d45bb5797963e25438a29 100644 (file)
--- a/simgear/timing/timezone.h
+++ b/simgear/timing/timezone.h
@@ -37,24 +37,24 @@
 class Timezone : public GeoCoord
 {
 private:
-  char* countryCode;
-  char* descriptor;
+  string countryCode;
+  string descriptor;
 
 public:
   Timezone() :
     GeoCoord()
     { 
-      countryCode = 0; 
-      descriptor = 0;
+      countryCode.erase(); 
+      descriptor.erase();
     };
   Timezone(float la, float lo, char* cc, char* desc);
   Timezone(const char *infoString);
   Timezone(const Timezone &other);
-  virtual ~Timezone() { delete [] countryCode; delete [] descriptor; };
+  virtual ~Timezone() { };
   
 
-  virtual void print() { printf("%s", descriptor);};
-  virtual char * getDescription() { return descriptor; };
+  virtual void print() { printf("%s", descriptor.c_str());};
+  virtual const char * getDescription() { return descriptor.c_str(); };
 };
 
 /************************************************************************