From 96e1630cc7b5cd5b53e8a6c44225f8c44dbe03c4 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 1 Sep 2006 12:46:45 +0000 Subject: [PATCH] Removed the String inhertiance from osg::Referenced. --- include/osgText/String | 5 ++--- src/osgText/String.cpp | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/osgText/String b/include/osgText/String index 5f5748f8a..23b9ff2fc 100644 --- a/include/osgText/String +++ b/include/osgText/String @@ -18,7 +18,6 @@ #include #include -#include #include namespace osgText { @@ -41,7 +40,7 @@ public: class Text; -class OSGTEXT_EXPORT String : public osg::Referenced, public VectorUInt +class OSGTEXT_EXPORT String : public VectorUInt { public: @@ -71,7 +70,7 @@ class OSGTEXT_EXPORT String : public osg::Referenced, public VectorUInt String(const wchar_t* text) { set(text); } String(const std::string& text,Encoding encoding) { set(text,encoding); } - virtual ~String() {} // public temporily while osgText is still in flux. + virtual ~String() {} String& operator = (const String& str); diff --git a/src/osgText/String.cpp b/src/osgText/String.cpp index 3e28cd2a1..fa10235a2 100644 --- a/src/osgText/String.cpp +++ b/src/osgText/String.cpp @@ -236,7 +236,6 @@ unsigned int getNextCharacter(look_ahead_iterator& charString,String::Encoding e // String::String(const String& str): - osg::Referenced(), vector_type(str) { }