From Nick, added VectorUInt in osgText/String hack to get around VS's stoopid compiler bugs.

From Robert, removed an #if #else #endif block, for code clarity.
This commit is contained in:
Robert Osfield
2004-01-27 11:50:32 +00:00
parent 28ce0c232b
commit d226e3ec68
3 changed files with 21 additions and 204 deletions

View File

@@ -25,7 +25,26 @@ namespace osgText {
class Text;
class OSGTEXT_EXPORT String : public osg::Referenced, public std::vector<unsigned int>
#ifndef _MSC_VER
typedef std::vector<unsigned int> VectorUInt;
#else // _MSC_VER
class VectorUInt: public std::vector<unsigned int> {
typedef std::vector<value_type> inherited;
public:
VectorUInt(): inherited() {}
explicit VectorUInt(size_type n): inherited(n) {}
VectorUInt(const VectorUInt &copy): inherited(copy) {}
//VectorUInt(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
template<class InputIterator>
VectorUInt(InputIterator beg_, InputIterator end_): inherited(beg_, end_) {}
};
#endif
class OSGTEXT_EXPORT String : public osg::Referenced, public VectorUInt
{
public: