From 405410660d0e2e03e088acd258167c3a3a666189 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Wed, 28 Jun 2017 15:59:15 +0200
Subject: [PATCH] caChannel: remove boilerplate

---
 src/ca/caChannel.cpp  | 44 -------------------------------------------
 src/ca/pv/caChannel.h | 16 ----------------
 2 files changed, 60 deletions(-)

diff --git a/src/ca/caChannel.cpp b/src/ca/caChannel.cpp
index e83ab0b..06ae75d 100644
--- a/src/ca/caChannel.cpp
+++ b/src/ca/caChannel.cpp
@@ -398,16 +398,6 @@ AccessRights CAChannel::getAccessRights(epics::pvData::PVField::shared_pointer c
 }
 
 
-ChannelProcess::shared_pointer CAChannel::createChannelProcess(
-    ChannelProcessRequester::shared_pointer const & channelProcessRequester,
-    epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
-{
-    Status errorStatus(Status::STATUSTYPE_ERROR, "not supported");
-    ChannelProcess::shared_pointer nullChannelProcess;
-    EXCEPTION_GUARD(channelProcessRequester->channelProcessConnect(errorStatus, nullChannelProcess));
-    return nullChannelProcess;
-}
-
 ChannelGet::shared_pointer CAChannel::createChannelGet(
     ChannelGetRequester::shared_pointer const & channelGetRequester,
     epics::pvData::PVStructure::shared_pointer const & pvRequest)
@@ -423,28 +413,6 @@ ChannelPut::shared_pointer CAChannel::createChannelPut(
     return CAChannelPut::create(shared_from_this(), channelPutRequester, pvRequest);
 }
 
-ChannelPutGet::shared_pointer CAChannel::createChannelPutGet(
-    ChannelPutGetRequester::shared_pointer const & channelPutGetRequester,
-    epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
-{
-    Status errorStatus(Status::STATUSTYPE_ERROR, "not supported");
-    ChannelPutGet::shared_pointer nullChannelPutGet;
-    EXCEPTION_GUARD(channelPutGetRequester->channelPutGetConnect(errorStatus, nullChannelPutGet,
-                    Structure::const_shared_pointer(), Structure::const_shared_pointer()));
-    return nullChannelPutGet;
-}
-
-
-ChannelRPC::shared_pointer CAChannel::createChannelRPC(
-    ChannelRPCRequester::shared_pointer const & channelRPCRequester,
-    epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
-{
-    Status errorStatus(Status::STATUSTYPE_ERROR, "not supported");
-    ChannelRPC::shared_pointer nullChannelRPC;
-    EXCEPTION_GUARD(channelRPCRequester->channelRPCConnect(errorStatus, nullChannelRPC));
-    return nullChannelRPC;
-}
-
 
 Monitor::shared_pointer CAChannel::createMonitor(
     MonitorRequester::shared_pointer const & monitorRequester,
@@ -454,18 +422,6 @@ Monitor::shared_pointer CAChannel::createMonitor(
 }
 
 
-ChannelArray::shared_pointer CAChannel::createChannelArray(
-    ChannelArrayRequester::shared_pointer const & channelArrayRequester,
-    epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
-{
-    Status errorStatus(Status::STATUSTYPE_ERROR, "not supported");
-    ChannelArray::shared_pointer nullChannelArray;
-    EXCEPTION_GUARD(channelArrayRequester->channelArrayConnect(errorStatus, nullChannelArray,
-                    Array::const_shared_pointer()));
-    return nullChannelArray;
-}
-
-
 void CAChannel::printInfo(std::ostream& out)
 {
     out << "CHANNEL  : " << getChannelName() << std::endl;
diff --git a/src/ca/pv/caChannel.h b/src/ca/pv/caChannel.h
index 7700fb9..900dcd1 100644
--- a/src/ca/pv/caChannel.h
+++ b/src/ca/pv/caChannel.h
@@ -52,10 +52,6 @@ public:
 
     virtual AccessRights getAccessRights(epics::pvData::PVField::shared_pointer const & pvField);
 
-    virtual ChannelProcess::shared_pointer createChannelProcess(
-        ChannelProcessRequester::shared_pointer const & channelProcessRequester,
-        epics::pvData::PVStructure::shared_pointer const & pvRequest);
-
     virtual ChannelGet::shared_pointer createChannelGet(
         ChannelGetRequester::shared_pointer const & channelGetRequester,
         epics::pvData::PVStructure::shared_pointer const & pvRequest);
@@ -64,22 +60,10 @@ public:
         ChannelPutRequester::shared_pointer const & channelPutRequester,
         epics::pvData::PVStructure::shared_pointer const & pvRequest);
 
-    virtual ChannelPutGet::shared_pointer createChannelPutGet(
-        ChannelPutGetRequester::shared_pointer const & channelPutGetRequester,
-        epics::pvData::PVStructure::shared_pointer const & pvRequest);
-
-    virtual ChannelRPC::shared_pointer createChannelRPC(
-        ChannelRPCRequester::shared_pointer const & channelRPCRequester,
-        epics::pvData::PVStructure::shared_pointer const & pvRequest);
-
     virtual Monitor::shared_pointer createMonitor(
         MonitorRequester::shared_pointer const & monitorRequester,
         epics::pvData::PVStructure::shared_pointer const & pvRequest);
 
-    virtual ChannelArray::shared_pointer createChannelArray(
-        ChannelArrayRequester::shared_pointer const & channelArrayRequester,
-        epics::pvData::PVStructure::shared_pointer const & pvRequest);
-
     virtual void printInfo(std::ostream& out);
 
     /* --------------- epics::pvData::Destroyable --------------- */