epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

collapse SimpleChannelSearchManagerImpl into ChannelSearchManager

Browse Source 
Virtual base with only one sub-class.  So avoid some unnecessary
indirection.
This commit is contained in:
Michael Davidsaver
2018-03-28 13:37:42 -07:00
parent 1a100a0955
commit 735dc22e2d
5 changed files with 166 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/remoteClient/clientContextImpl.cpp
View File

@@ -28,7 +28,7 @@
#include <pv/codec.h>
#include <pv/channelSearchManager.h>
#include <pv/serializationHelper.h>
#include <pv/simpleChannelSearchManagerImpl.h>
#include <pv/channelSearchManager.h>
#include <pv/clientContextImpl.h>
#include <pv/configuration.h>
#include <pv/beaconHandler.h>
@@ -4152,7 +4152,7 @@ private:
// stores many weak_ptr
m_responseHandler.reset(new ClientResponseHandler(thisPointer));
m_channelSearchManager.reset(new SimpleChannelSearchManagerImpl(thisPointer));
m_channelSearchManager.reset(new ChannelSearchManager(thisPointer));
// preinitialize security plugins
SecurityPluginRegistry::instance();
@@ -4586,7 +4586,7 @@ private:
* Channel search manager.
* Manages UDP search requests.
*/
SimpleChannelSearchManagerImpl::shared_pointer m_channelSearchManager;
ChannelSearchManager::shared_pointer m_channelSearchManager;
/**
* Beacon handler map.