remove CopyPolicy from ModelRegistry

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

diff --git a/simgear/timing/timezone.h b/simgear/timing/timezone.h
index e286d857d55ea72bbdc5e7d409b1554187eec062..f5779fd374aca1f50c5aa5116f28840c90841e91 100644 (file)
--- a/simgear/timing/timezone.h
+++ b/simgear/timing/timezone.h
@@ -12,10 +12,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  **************************************************************************/
 
@@ -29,6 +28,7 @@
 #define _TIMEZONE_H_
 
 #include <stdio.h>
+#include <string>
 
 #include <simgear/timing/geocoord.h>
 
@@ -44,8 +44,8 @@ class SGTimeZone : public SGGeoCoord
 
 private:
 
-  string countryCode;
-  string descriptor;
+  std::string countryCode;
+  std::string descriptor;
 
 public:
 
@@ -85,11 +85,6 @@ public:
      */
     virtual ~SGTimeZone() { };
   
-    /**
-     * Print the descriptor string
-     */
-    virtual void print() { printf("%s", descriptor.c_str()); }
-
     /**
      * Return the descriptor string
      * @return descriptor string (char array)