From 2b68bebb5d25969b7ff088dbb35df0ccd75d3777 Mon Sep 17 00:00:00 2001 From: Torsten Dreyer <Torsten@t3r.de> Date: Mon, 14 Nov 2011 15:33:02 +0100 Subject: [PATCH] namespace std fixes --- src/Input/FGLinuxEventInput.cxx | 18 +++++++++--------- src/Input/FGLinuxEventInput.hxx | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Input/FGLinuxEventInput.cxx b/src/Input/FGLinuxEventInput.cxx index 86c04494e..e41f6e195 100644 --- a/src/Input/FGLinuxEventInput.cxx +++ b/src/Input/FGLinuxEventInput.cxx @@ -225,7 +225,7 @@ static struct enbet { }; -class EventNameByEventType : public map<unsigned,const char*> { +class EventNameByEventType : public std::map<unsigned,const char*> { public: EventNameByEventType() { for( unsigned i = 0; i < sizeof(EVENT_NAMES_BY_EVENT_TYPE)/sizeof(EVENT_NAMES_BY_EVENT_TYPE[0]); i++ ) @@ -234,7 +234,7 @@ public: }; static EventNameByEventType EVENT_NAME_BY_EVENT_TYPE; -class EventNameByType : public map<TypeCode,const char*> { +class EventNameByType : public std::map<TypeCode,const char*> { public: EventNameByType() { for( unsigned i = 0; i < sizeof(EVENT_TYPES)/sizeof(EVENT_TYPES[0]); i++ ) @@ -246,11 +246,11 @@ static EventNameByType EVENT_NAME_BY_TYPE; struct ltstr { bool operator()(const char * s1, const char * s2 ) const { - return string(s1).compare( s2 ) < 0; + return std::string(s1).compare( s2 ) < 0; } }; -class EventTypeByName : public map<const char *,TypeCode,ltstr> { +class EventTypeByName : public std::map<const char *,TypeCode,ltstr> { public: EventTypeByName() { for( unsigned i = 0; i < sizeof(EVENT_TYPES)/sizeof(EVENT_TYPES[0]); i++ ) @@ -260,7 +260,7 @@ public: static EventTypeByName EVENT_TYPE_BY_NAME; -FGLinuxInputDevice::FGLinuxInputDevice( string aName, string aDevname ) : +FGLinuxInputDevice::FGLinuxInputDevice( std::string aName, std::string aDevname ) : FGInputDevice(aName), devname( aDevname ), fd(-1) @@ -290,7 +290,7 @@ void FGLinuxInputDevice::Open() { if( fd != -1 ) return; if( (fd = ::open( devname.c_str(), O_RDWR )) == -1 ) { - throw exception(); + throw std::exception(); } if( GetGrab() && ioctl( fd, EVIOCGRAB, 2 ) == -1 ) { @@ -440,7 +440,7 @@ const char * FGLinuxInputDevice::TranslateEventName( FGEventData & eventData ) return EVENT_NAME_BY_TYPE[typeCode]; } -void FGLinuxInputDevice::SetDevname( string name ) +void FGLinuxInputDevice::SetDevname( std::string name ) { this->devname = name; } @@ -540,8 +540,8 @@ void FGLinuxEventInput::update( double dt ) // index the input devices by the associated fd and prepare // the pollfd array by filling in the file descriptor struct pollfd fds[input_devices.size()]; - map<int,FGLinuxInputDevice*> devicesByFd; - map<int,FGInputDevice*>::const_iterator it; + std::map<int,FGLinuxInputDevice*> devicesByFd; + std::map<int,FGInputDevice*>::const_iterator it; int i; for( i=0, it = input_devices.begin(); it != input_devices.end(); ++it, i++ ) { FGInputDevice* p = (*it).second; diff --git a/src/Input/FGLinuxEventInput.hxx b/src/Input/FGLinuxEventInput.hxx index 3676c48cb..f3bfa044f 100644 --- a/src/Input/FGLinuxEventInput.hxx +++ b/src/Input/FGLinuxEventInput.hxx @@ -43,7 +43,7 @@ struct FGLinuxEventData : public FGEventData { class FGLinuxInputDevice : public FGInputDevice { public: FGLinuxInputDevice(); - FGLinuxInputDevice( string name, string devname ); + FGLinuxInputDevice( std::string name, std::string devname ); virtual ~FGLinuxInputDevice(); virtual void Open(); @@ -51,17 +51,17 @@ public: virtual void Send( const char * eventName, double value ); virtual const char * TranslateEventName( FGEventData & eventData ); - void SetDevname( const string name ); - string GetDevname() const { return devname; } + void SetDevname( const std::string name ); + std::string GetDevname() const { return devname; } int GetFd() { return fd; } double Normalize( struct input_event & event ); private: - string devname; + std::string devname; int fd; - map<unsigned int,input_absinfo> absinfo; + std::map<unsigned int,input_absinfo> absinfo; }; class FGLinuxEventInput : public FGEventInput {