diff --git a/src/ca/caChannel.cpp b/src/ca/caChannel.cpp index 15f03fe..2a4bfcf 100644 --- a/src/ca/caChannel.cpp +++ b/src/ca/caChannel.cpp @@ -277,13 +277,6 @@ std::tr1::shared_ptr CAChannel::getChannelRequester() return channelRequester; } - -bool CAChannel::isConnected() -{ - return (ca_state(channelID) == cs_conn); -} - - void CAChannel::getField(GetFieldRequester::shared_pointer const & requester, std::string const & subField) { @@ -383,12 +376,6 @@ ChannelArray::shared_pointer CAChannel::createChannelArray( } -void CAChannel::printInfo() -{ - printInfo(std::cout); -} - - void CAChannel::printInfo(std::ostream& out) { out << "CHANNEL : " << getChannelName() << std::endl; @@ -403,21 +390,6 @@ void CAChannel::printInfo(std::ostream& out) } -/* --------------- epics::pvData::Requester --------------- */ - - -string CAChannel::getRequesterName() -{ - return getChannelName(); -} - - -void CAChannel::message(std::string const & message,MessageType messageType) -{ - std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl; -} - - /* --------------- epics::pvData::Destroyable --------------- */ diff --git a/src/ca/pv/caChannel.h b/src/ca/pv/caChannel.h index 30517aa..ce1383f 100644 --- a/src/ca/pv/caChannel.h +++ b/src/ca/pv/caChannel.h @@ -47,7 +47,6 @@ public: virtual ConnectionState getConnectionState(); virtual std::string getChannelName(); virtual std::tr1::shared_ptr getChannelRequester(); - virtual bool isConnected(); virtual void getField(GetFieldRequester::shared_pointer const & requester,std::string const & subField); @@ -81,16 +80,8 @@ public: ChannelArrayRequester::shared_pointer const & channelArrayRequester, epics::pvData::PVStructure::shared_pointer const & pvRequest); - virtual void printInfo(); - virtual void printInfo(std::ostream& out); - /* --------------- epics::pvData::Requester --------------- */ - - virtual std::string getRequesterName(); - - virtual void message(std::string const & message, epics::pvData::MessageType messageType); - /* --------------- epics::pvData::Destroyable --------------- */ virtual void destroy();