include files put into include/pv

configure/CONFIG_SITE

@@ -32,3 +32,6 @@ ifeq ($(EPICS_HOST_ARCH),linux-x86)
     USR_LDFLAGS += -lpthread
 endif
 
+INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
+USR_INCLUDES += -I $(INSTALL_LOCATION)/include
+

configure/RELEASE

@@ -26,11 +26,11 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
 
 # EPICS_BASE usually appears last so other apps can override stuff:
 
-PVDATA=/Users/msekoranja/tmp/pvDataCPP
-EPICS_BASE=/opt/epics/base
+#PVDATA=/Users/msekoranja/tmp/pvDataCPP
+#EPICS_BASE=/opt/epics/base
 
-#PVDATA=/home/mrk/hg/pvDataCPP
-#EPICS_BASE=/home/install/epics/base
+PVDATA=/home/mrk/hg/pvDataCPP
+EPICS_BASE=/home/install/epics/base
 
 # Set RULES here if you want to take build rules from somewhere
 # other than EPICS_BASE:

pvAccessApp/ca/caConstants.h

@@ -8,7 +8,7 @@
 #ifndef CONSTANTS_H_
 #define CONSTANTS_H_
 
-#include <pvType.h>
+#include <pv/pvType.h>
 
 using namespace epics::pvData;
 

pvAccessApp/ca/clientFactory.cpp

@@ -1,7 +1,7 @@
 /* clientFactory.cpp */
 /* Author:  Matej Sekoranja Date: 2011.2.1 */
 
-#include <clientFactory.h>
+#include <pv/clientFactory.h>
 #include <errlog.h>
 
 using namespace epics::pvData;

pvAccessApp/ca/clientFactory.h

@@ -2,8 +2,8 @@
 #ifndef CLIENTFACTORY_H
 #define CLIENTFACTORY_H
 
-#include <clientContextImpl.h>
-#include <lock.h>
+#include <pv/clientContextImpl.h>
+#include <pv/lock.h>
 
 namespace epics { namespace pvAccess { 
 

pvAccessApp/ca/version.cpp

@@ -7,7 +7,7 @@
 
 #include <sstream>
 
-#include "version.h"
+#include <pv/version.h>
 
 using std::stringstream;
 using epics::pvData::String;

pvAccessApp/ca/version.h

@@ -8,8 +8,8 @@
 #ifndef VERSION_H_
 #define VERSION_H_
 
-#include <pvType.h>
-#include <noDefaultMethods.h>
+#include <pv/pvType.h>
+#include <pv/noDefaultMethods.h>
 
 namespace epics {
     namespace pvAccess {

pvAccessApp/client/pvAccess.cpp

@@ -4,10 +4,10 @@
  * EPICS pvDataCPP is distributed subject to a Software License Agreement found
  * in file LICENSE that is included with this distribution.
  */
-#include <pvAccess.h>
+#include <pv/pvAccess.h>
 
 namespace epics { namespace pvAccess {
 
 const char* Channel::ConnectionStateNames[] = { "NEVER_CONNECTED", "CONNECTED", "DISCONNECTED", "DESTROYED" };
 
-}}
+}}

pvAccessApp/client/pvAccess.h

@@ -1,13 +1,13 @@
 /* pvAccess.h */
 #ifndef PVACCESS_H
 #define PVACCESS_H
-#include <pvData.h>
-#include <status.h>
-#include <destroyable.h>
-#include <monitor.h>
-#include <version.h>
+#include <pv/pvData.h>
+#include <pv/status.h>
+#include <pv/destroyable.h>
+#include <pv/monitor.h>
+#include <pv/version.h>
 #include <vector>
-#include <bitSet.h>
+#include <pv/bitSet.h>
 
 namespace epics { namespace pvAccess { 
 

pvAccessApp/factory/ChannelAccessFactory.cpp

@@ -1,10 +1,10 @@
 /*ChannelAccessFactory.cpp*/
 
-#include <lock.h>
-#include <noDefaultMethods.h>
-#include <pvAccess.h>
-#include <pvData.h>
-#include <factory.h>
+#include <pv/lock.h>
+#include <pv/noDefaultMethods.h>
+#include <pv/pvAccess.h>
+#include <pv/pvData.h>
+#include <pv/factory.h>
 #include <map>
 #include <vector>
 

pvAccessApp/factory/CreateRequestFactory.cpp

@@ -6,9 +6,9 @@
  */
 #include <string>
 #include <sstream>
-#include <pvData.h>
-#include <lock.h>
-#include <pvAccess.h>
+#include <pv/pvData.h>
+#include <pv/lock.h>
+#include <pv/pvAccess.h>
 
 using namespace epics::pvData;
 

pvAccessApp/remote/abstractResponseHandler.cpp

@@ -5,10 +5,10 @@
  *      Author: Miha Vitorovic
  */
 
-#include "remote.h"
-#include <hexDump.h>
+#include <pv/remote.h>
+#include <pv/hexDump.h>
 
-#include <byteBuffer.h>
+#include <pv/byteBuffer.h>
 
 #include <osiSock.h>
 

pvAccessApp/remote/beaconHandler.cpp

@@ -2,8 +2,8 @@
  * beaconHandler.cpp
  */
 
-#include "beaconHandler.h"
-#include "transportRegistry.h"
+#include <pv/beaconHandler.h>
+#include <pv/transportRegistry.h>
 
 using namespace std;
 using namespace epics::pvData;

pvAccessApp/remote/beaconHandler.h

@@ -5,12 +5,12 @@
 #ifndef BEACONHANDLER_H
 #define BEACONHANDLER_H
 
-#include "remote.h"
-#include <pvAccess.h>
+#include <pv/remote.h>
+#include <pv/pvAccess.h>
 
-#include <timeStamp.h>
+#include <pv/timeStamp.h>
 #include <osiSock.h>
-#include <lock.h>
+#include <pv/lock.h>
 
 namespace epics { namespace pvAccess {
 

pvAccessApp/remote/blockingClientTCPTransport.cpp

@@ -6,12 +6,12 @@
  */
 
 /* pvAccess */
-#include "blockingTCP.h"
+#include <pv/blockingTCP.h>
 
-#include "introspectionRegistry.h"
+#include <pv/introspectionRegistry.h>
 
 /* pvData */
-#include <lock.h>
+#include <pv/lock.h>
 
 /* EPICSv3 */
 #include <errlog.h>

pvAccessApp/remote/blockingServerTCPTransport.cpp

@@ -6,12 +6,12 @@
  */
 
 /* pvAccess */
-#include "blockingTCP.h"
-#include "remote.h"
+#include <pv/blockingTCP.h>
+#include <pv/remote.h>
 
 /* pvData */
-#include <lock.h>
-#include <byteBuffer.h>
+#include <pv/lock.h>
+#include <pv/byteBuffer.h>
 
 /* EPICSv3 */
 #include <errlog.h>

pvAccessApp/remote/blockingTCP.h

@@ -9,19 +9,19 @@
 #define BLOCKINGTCP_H_
 
 /* pvAccess */
-#include "caConstants.h"
-#include "remote.h"
-#include "transportRegistry.h"
-#include "introspectionRegistry.h"
-#include "namedLockPattern.h"
-#include "inetAddressUtil.h"
+#include <pv/caConstants.h>
+#include <pv/remote.h>
+#include <pv/transportRegistry.h>
+#include <pv/introspectionRegistry.h>
+#include <pv/namedLockPattern.h>
+#include <pv/inetAddressUtil.h>
 
 /* pvData */
-#include <byteBuffer.h>
-#include <pvType.h>
-#include <lock.h>
-#include <timer.h>
-#include <event.h>
+#include <pv/byteBuffer.h>
+#include <pv/pvType.h>
+#include <pv/lock.h>
+#include <pv/timer.h>
+#include <pv/event.h>
 
 /* EPICSv3 */
 #include <osdSock.h>

pvAccessApp/remote/blockingTCPAcceptor.cpp

@@ -3,11 +3,11 @@
  */
 
 /* pvAccess */
-#include <blockingTCP.h>
-#include <remote.h>
+#include <pv/blockingTCP.h>
+#include <pv/remote.h>
 
 /* pvData */
-#include <epicsException.h>
+#include <pv/epicsException.h>
 
 /* EPICSv3 */
 #include <errlog.h>

pvAccessApp/remote/blockingTCPConnector.cpp

@@ -5,9 +5,9 @@
  *      Author: Miha Vitorovic
  */
 
-#include "blockingTCP.h"
-#include "remote.h"
-#include "namedLockPattern.h"
+#include <pv/blockingTCP.h>
+#include <pv/remote.h>
+#include <pv/namedLockPattern.h>
 
 #include <epicsThread.h>
 #include <osiSock.h>

pvAccessApp/remote/blockingTCPTransport.cpp

@@ -5,16 +5,16 @@
  *      Author: Miha Vitorovic
  */
 
-#include "blockingTCP.h"
-#include <inetAddressUtil.h>
-#include <caConstants.h>
-#include <CDRMonitor.h>
+#include <pv/blockingTCP.h>
+#include <pv/inetAddressUtil.h>
+#include <pv/caConstants.h>
+#include <pv/CDRMonitor.h>
 
 /* pvData */
-#include <lock.h>
-#include <byteBuffer.h>
-#include <epicsException.h>
-#include <noDefaultMethods.h>
+#include <pv/lock.h>
+#include <pv/byteBuffer.h>
+#include <pv/epicsException.h>
+#include <pv/noDefaultMethods.h>
 
 /* EPICSv3 */
 #include <osdSock.h>

pvAccessApp/remote/blockingUDP.h

@@ -9,15 +9,15 @@
 #define BLOCKINGUDP_H_
 
 /* pvAccess */
-#include "remote.h"
-#include "caConstants.h"
-#include "inetAddressUtil.h"
+#include <pv/remote.h>
+#include <pv/caConstants.h>
+#include <pv/inetAddressUtil.h>
 
 /* pvData */
-#include <noDefaultMethods.h>
-#include <byteBuffer.h>
-#include <lock.h>
-#include <event.h>
+#include <pv/noDefaultMethods.h>
+#include <pv/byteBuffer.h>
+#include <pv/lock.h>
+#include <pv/event.h>
 
 /* EPICSv3 */
 #include <osdSock.h>

pvAccessApp/remote/blockingUDPConnector.cpp

@@ -6,8 +6,8 @@
  */
 
 /* pvAccess */
-#include "blockingUDP.h"
-#include "remote.h"
+#include <pv/blockingUDP.h>
+#include <pv/remote.h>
 
 /* EPICSv3 */
 #include <errlog.h>

pvAccessApp/remote/blockingUDPTransport.cpp

@@ -5,15 +5,15 @@
  */
 
 /* pvAccess */
-#include "blockingUDP.h"
+#include <pv/blockingUDP.h>
 
-#include <caConstants.h>
-#include <inetAddressUtil.h>
+#include <pv/caConstants.h>
+#include <pv/inetAddressUtil.h>
 
 /* pvData */
-#include <byteBuffer.h>
-#include <lock.h>
-#include <CDRMonitor.h>
+#include <pv/byteBuffer.h>
+#include <pv/lock.h>
+#include <pv/CDRMonitor.h>
 
 /* EPICSv3 */
 #include <osdSock.h>

pvAccessApp/remote/channelSearchManager.cpp

@@ -2,7 +2,7 @@
  * channelSearchManager.cpp
  */
 
-#include "channelSearchManager.h"
+#include <pv/channelSearchManager.h>
 
 using namespace std;
 

pvAccessApp/remote/channelSearchManager.h

@@ -5,15 +5,15 @@
 #ifndef CHANNELSEARCHMANAGER_H
 #define CHANNELSEARCHMANAGER_H
 
-#include "remote.h"
-#include "pvAccess.h"
-#include "caConstants.h"
-#include "blockingUDP.h"
+#include <pv/remote.h>
+#include <pv/pvAccess.h>
+#include <pv/caConstants.h>
+#include <pv/blockingUDP.h>
 
-#include <timeStamp.h>
+#include <pv/timeStamp.h>
 #include <osiSock.h>
-#include <lock.h>
-#include <timer.h>
+#include <pv/lock.h>
+#include <pv/timer.h>
 
 #include <iostream>
 #include <float.h>

pvAccessApp/remote/remote.h

@@ -8,17 +8,17 @@
 #ifndef REMOTE_H_
 #define REMOTE_H_
 
-#include <caConstants.h>
-#include <configuration.h>
-#include "introspectionRegistry.h"
+#include <pv/caConstants.h>
+#include <pv/configuration.h>
+#include <pv/introspectionRegistry.h>
 
-#include <serialize.h>
-#include <pvType.h>
-#include <byteBuffer.h>
-#include <timer.h>
-#include <pvData.h>
+#include <pv/serialize.h>
+#include <pv/pvType.h>
+#include <pv/byteBuffer.h>
+#include <pv/timer.h>
+#include <pv/pvData.h>
 
-#include <sharedPtr.h>
+#include <pv/sharedPtr.h>
 
 #include <osiSock.h>
 #include <osdSock.h>

pvAccessApp/remoteClient/clientContextImpl.cpp

@@ -4,29 +4,29 @@
 /* Author:  Matej Sekoranja Date: 2011.1.1 */
 
 
-#include <pvAccess.h>
+#include <pv/pvAccess.h>
 #include <iostream>
 #include <sstream>
-#include <CDRMonitor.h>
-#include <lock.h>
-#include <standardPVField.h>
+#include <pv/CDRMonitor.h>
+#include <pv/lock.h>
+#include <pv/standardPVField.h>
 #include <memory>
 
 #include <stdexcept>
-#include <caConstants.h>
-#include <timer.h>
-#include <blockingUDP.h>
-#include <blockingTCP.h>
-#include <namedLockPattern.h>
-#include <inetAddressUtil.h>
-#include <hexDump.h>
-#include <remote.h>
-#include <channelSearchManager.h>
-#include <clientContextImpl.h>
-#include <configuration.h>
-#include <beaconHandler.h>
+#include <pv/caConstants.h>
+#include <pv/timer.h>
+#include <pv/blockingUDP.h>
+#include <pv/blockingTCP.h>
+#include <pv/namedLockPattern.h>
+#include <pv/inetAddressUtil.h>
+#include <pv/hexDump.h>
+#include <pv/remote.h>
+#include <pv/channelSearchManager.h>
+#include <pv/clientContextImpl.h>
+#include <pv/configuration.h>
+#include <pv/beaconHandler.h>
 #include <errlog.h>
-#include <bitSetUtil.h>
+#include <pv/bitSetUtil.h>
 
 using std::tr1::dynamic_pointer_cast;
 using std::tr1::static_pointer_cast;

pvAccessApp/remoteClient/clientContextImpl.h

@@ -8,10 +8,10 @@
 #ifndef CLIENTCONTEXTIMPL_H_
 #define CLIENTCONTEXTIMPL_H_
 
-#include <pvAccess.h>
-#include <remote.h>
-#include <sharedPtr.h>
-#include <channelSearchManager.h>
+#include <pv/pvAccess.h>
+#include <pv/remote.h>
+#include <pv/sharedPtr.h>
+#include <pv/channelSearchManager.h>
 
 class ChannelSearchManager;
 

pvAccessApp/server/baseChannelRequester.cpp

@@ -2,7 +2,7 @@
  * baseChannelRequester.cpp
  */
 
-#include "baseChannelRequester.h"
+#include <pv/baseChannelRequester.h>
 
 using namespace epics::pvData;
 

pvAccessApp/server/baseChannelRequester.h

@@ -5,11 +5,11 @@
 #ifndef BASECHANNELREQUESTER_H_
 #define BASECHANNELREQUESTER_H_
 
-#include "serverContext.h"
-#include "serverChannelImpl.h"
+#include <pv/serverContext.h>
+#include <pv/serverChannelImpl.h>
 
-#include <requester.h>
-#include <destroyable.h>
+#include <pv/requester.h>
+#include <pv/destroyable.h>
 
 namespace epics {
 namespace pvAccess {

pvAccessApp/server/beaconEmitter.cpp

@@ -2,14 +2,14 @@
  * beaconEmitter.cpp
  */
 
-#include "beaconEmitter.h"
+#include <pv/beaconEmitter.h>
 
-#include <introspectionRegistry.h>
+#include <pv/introspectionRegistry.h>
 
 #include <errlog.h>
 #include <algorithm>
 
-#include <serverContext.h>
+#include <pv/serverContext.h>
 
 using namespace std;
 

pvAccessApp/server/beaconEmitter.h

@@ -5,15 +5,15 @@
 #ifndef BEACONEMITTER_H
 #define BEACONEMITTER_H
 
-#include <timer.h>
-#include <timeStamp.h>
-#include <remote.h>
+#include <pv/timer.h>
+#include <pv/timeStamp.h>
+#include <pv/remote.h>
 
 #include <osiSock.h>
 
-#include <beaconServerStatusProvider.h>
-//#include <serverContext.h>
-#include <sharedPtr.h>
+#include <pv/beaconServerStatusProvider.h>
+//#include <pv/serverContext.h>
+#include <pv/sharedPtr.h>
 
 namespace epics { namespace pvAccess {
 

pvAccessApp/server/beaconServerStatusProvider.cpp

@@ -2,8 +2,8 @@
  * beaconServerStatusProvider.cpp
  */
 
-#include "beaconServerStatusProvider.h"
-#include <serverContext.h>
+#include <pv/beaconServerStatusProvider.h>
+#include <pv/serverContext.h>
 
 using namespace epics::pvData;
 

pvAccessApp/server/beaconServerStatusProvider.h

@@ -5,9 +5,9 @@
 #ifndef BEACONSERVERSTATUSPROVIDER_H
 #define BEACONSERVERSTATUSPROVIDER_H
 
-#include <pvData.h>
-//#include <serverContext.h>
-#include <sharedPtr.h>
+#include <pv/pvData.h>
+//#include <pv/serverContext.h>
+#include <pv/sharedPtr.h>
 
 namespace epics { namespace pvAccess {
 

pvAccessApp/server/responseHandlers.cpp

@@ -2,11 +2,11 @@
  * responseHandlers.cpp
  */
 
-#include "responseHandlers.h"
-#include <remote.h>
-#include <hexDump.h>
+#include <pv/responseHandlers.h>
+#include <pv/remote.h>
+#include <pv/hexDump.h>
 
-#include <byteBuffer.h>
+#include <pv/byteBuffer.h>
 
 #include <osiSock.h>
 #include <errlog.h>

pvAccessApp/server/responseHandlers.h

@@ -5,10 +5,10 @@
 #ifndef RESPONSEHANDLERS_H_
 #define RESPONSEHANDLERS_H_
 
-#include "serverContext.h"
-#include <remote.h>
-#include "serverChannelImpl.h"
-#include "baseChannelRequester.h"
+#include <pv/serverContext.h>
+#include <pv/remote.h>
+#include <pv/serverChannelImpl.h>
+#include <pv/baseChannelRequester.h>
 
 namespace epics {
     namespace pvAccess {

pvAccessApp/server/serverChannelImpl.cpp

@@ -2,7 +2,7 @@
  * serverChannelImpl.cpp
  */
 
-#include "serverChannelImpl.h"
+#include <pv/serverChannelImpl.h>
 
 using namespace epics::pvData;
 

pvAccessApp/server/serverChannelImpl.h

@@ -5,10 +5,10 @@
 #ifndef SERVERCHANNEL_H_
 #define SERVERCHANNEL_H_
 
-#include <remote.h>
-#include <clientContextImpl.h>
+#include <pv/remote.h>
+#include <pv/clientContextImpl.h>
 
-#include <destroyable.h>
+#include <pv/destroyable.h>
 
 namespace epics {
 namespace pvAccess {

pvAccessApp/server/serverContext.cpp

@@ -2,8 +2,8 @@
  * serverContext.cpp
  */
 
-#include "serverContext.h"
-#include "responseHandlers.h"
+#include <pv/serverContext.h>
+#include <pv/responseHandlers.h>
 
 using std::tr1::dynamic_pointer_cast;
 using std::tr1::static_pointer_cast;

pvAccessApp/server/serverContext.h

@@ -5,15 +5,15 @@
 #ifndef SERVERCONTEXT_H_
 #define SERVERCONTEXT_H_
 
-#include <remote.h>
-#include <beaconServerStatusProvider.h>
-#include <caConstants.h>
-#include <version.h>
-#include <pvAccess.h>
-#include <blockingUDP.h>
-#include <blockingTCP.h>
-#include "beaconEmitter.h"
-#include <logger.h>
+#include <pv/remote.h>
+#include <pv/beaconServerStatusProvider.h>
+#include <pv/caConstants.h>
+#include <pv/version.h>
+#include <pv/pvAccess.h>
+#include <pv/blockingUDP.h>
+#include <pv/blockingTCP.h>
+#include <pv/beaconEmitter.h>
+#include <pv/logger.h>
 
 #include <errlog.h>
 

pvAccessApp/utils/configuration.cpp

@@ -2,8 +2,8 @@
  * configuration.cpp
  */
 
-#include "configuration.h"
-#include <epicsException.h>
+#include <pv/configuration.h>
+#include <pv/epicsException.h>
 
 namespace epics { namespace pvAccess {
 

pvAccessApp/utils/configuration.h

@@ -5,10 +5,10 @@
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
-#include <pvType.h>
-#include <noDefaultMethods.h>
-#include <lock.h>
-#include <sharedPtr.h>
+#include <pv/pvType.h>
+#include <pv/noDefaultMethods.h>
+#include <pv/lock.h>
+#include <pv/sharedPtr.h>
 
 #include <envDefs.h>
 

pvAccessApp/utils/hexDump.cpp

@@ -5,7 +5,7 @@
  *      Author: Miha Vitorovic
  */
 
-#include "hexDump.h"
+#include <pv/hexDump.h>
 
 #include <iostream>
 #include <sstream>

pvAccessApp/utils/hexDump.h

@@ -8,7 +8,7 @@
 #ifndef HEXDUMP_H_
 #define HEXDUMP_H_
 
-#include <pvType.h>
+#include <pv/pvType.h>
 
 namespace epics {
     namespace pvAccess {

pvAccessApp/utils/inetAddressUtil.cpp

@@ -5,16 +5,16 @@
  *      Author: Miha Vitorovic
  */
 /* pvAccess */
-#include "inetAddressUtil.h"
+#include <pv/inetAddressUtil.h>
 
 /* pvData */
-#include <byteBuffer.h>
+#include <pv/byteBuffer.h>
+#include <pv/epicsException.h>
 
 /* EPICSv3 */
 #include <osiSock.h>
 #include <ellLib.h>
 #include <epicsAssert.h>
-#include <epicsException.h>
 #include <errlog.h>
 
 /* standard */

pvAccessApp/utils/inetAddressUtil.h

@@ -20,8 +20,8 @@
  *
  */
 
-#include <pvType.h>
-#include <byteBuffer.h>
+#include <pv/pvType.h>
+#include <pv/byteBuffer.h>
 #include <osiSock.h>
 #include <vector>
 

pvAccessApp/utils/introspectionRegistry.cpp

@@ -2,8 +2,8 @@
  * introspectionRegistry.cpp
  */
 
-#include "introspectionRegistry.h"
-#include <convert.h>
+#include <pv/introspectionRegistry.h>
+#include <pv/convert.h>
 
 using std::tr1::static_pointer_cast;
 

pvAccessApp/utils/introspectionRegistry.h

@@ -5,14 +5,14 @@
 #ifndef INTROSPECTIONREGISTRY_H
 #define INTROSPECTIONREGISTRY_H
 
-#include <lock.h>
-#include <pvIntrospect.h>
-#include <pvData.h>
-#include <byteBuffer.h>
-#include <serialize.h>
-#include <serializeHelper.h>
-#include <status.h>
-#include <standardField.h>
+#include <pv/lock.h>
+#include <pv/pvIntrospect.h>
+#include <pv/pvData.h>
+#include <pv/byteBuffer.h>
+#include <pv/serialize.h>
+#include <pv/serializeHelper.h>
+#include <pv/status.h>
+#include <pv/standardField.h>
 
 #include <epicsMutex.h>
 

pvAccessApp/utils/logger.cpp

@@ -5,11 +5,11 @@
  *      Author: Miha Vitorovic
  */
 
-#include "logger.h"
+#include <pv/logger.h>
 
-#include <noDefaultMethods.h>
-#include <lock.h>
-#include <pvType.h>
+#include <pv/noDefaultMethods.h>
+#include <pv/lock.h>
+#include <pv/pvType.h>
 
 #include <epicsExit.h>
 #include <errlog.h>

pvAccessApp/utils/logger.h

@@ -8,7 +8,7 @@
 #ifndef LOGGER_H_
 #define LOGGER_H_
 
-#include <pvType.h>
+#include <pv/pvType.h>
 
 namespace epics {
     namespace pvAccess {

pvAccessApp/utils/namedLockPattern.h

@@ -8,10 +8,10 @@
 #include <map>
 #include <iostream>
 
-#include <lock.h>
-#include <pvType.h>
+#include <pv/lock.h>
+#include <pv/pvType.h>
 
-#include "referenceCountingLock.h"
+#include <pv/referenceCountingLock.h>
 
 // TODO implement using smart pointers
 

pvAccessApp/utils/referenceCountingLock.cpp

@@ -2,7 +2,7 @@
  * namedLockPattern.cpp
  */
 
-#include "referenceCountingLock.h"
+#include <pv/referenceCountingLock.h>
 
 namespace epics { namespace pvAccess {
 

pvAccessApp/utils/referenceCountingLock.h

@@ -5,8 +5,8 @@
 #ifndef REFERENCECOUNTINGLOCK_H
 #define REFERENCECOUNTINGLOCK_H
 
-#include <lock.h>
-#include <pvType.h>
+#include <pv/lock.h>
+#include <pv/pvType.h>
 
 namespace epics { namespace pvAccess {
 

pvAccessApp/utils/transportRegistry.cpp

@@ -2,7 +2,7 @@
  * transportRegistry.cpp
  */
 
-#include "transportRegistry.h"
+#include <pv/transportRegistry.h>
 
 using namespace epics::pvData;
 using namespace std;

pvAccessApp/utils/transportRegistry.h

@@ -11,12 +11,12 @@
 
 #include <osiSock.h>
 
-#include <lock.h>
-#include <pvType.h>
-#include <epicsException.h>
-#include <remote.h>
-#include "inetAddressUtil.h"
-#include <sharedPtr.h>
+#include <pv/lock.h>
+#include <pv/pvType.h>
+#include <pv/epicsException.h>
+#include <pv/remote.h>
+#include <pv/inetAddressUtil.h>
+#include <pv/sharedPtr.h>
 
 namespace epics { namespace pvAccess {
 

pvAccessApp/utils/wildcharMatcher.cpp

@@ -5,7 +5,7 @@
  *      Author: Miha Vitorovic
  */
 
-#include "wildcharMatcher.h"
+#include <pv/wildcharMatcher.h>
 
 #include <iostream>
 

pvAccessApp/utils/wildcharMatcher.h

@@ -8,7 +8,7 @@
 #ifndef WILDCHARMATCHER_H_
 #define WILDCHARMATCHER_H_
 
-#include <pvType.h>
+#include <pv/pvType.h>
 
 namespace epics {
     namespace pvAccess {

testApp/client/MockClientImpl.cpp

@@ -3,7 +3,7 @@
 
 
 #include <epicsExit.h>
-#include <pvAccess.h>
+#include <pv/pvAccess.h>
 #include <iostream>
 #include <CDRMonitor.h>
 #include <lock.h>

testApp/client/testChannelAccessFactory.cpp

@@ -6,7 +6,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
-#include <pvAccess.h>
+#include <pv/pvAccess.h>
 
 
 #include <epicsAssert.h>

testApp/client/testCreateRequest.cpp

@@ -6,7 +6,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
-#include <pvAccess.h>
+#include <pv/pvAccess.h>
 #include <CDRMonitor.h>
 #include <iostream>
 

testApp/remote/pvget.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include <clientFactory.h>
+#include <pv/clientFactory.h>
 
 #include <stdio.h>
 #include <epicsStdlib.h>

testApp/remote/pvput.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include <clientFactory.h>
+#include <pv/clientFactory.h>
 
 #include <stdio.h>
 #include <epicsStdlib.h>
@@ -9,7 +9,7 @@
 #include <vector>
 #include <string>
 
-#include <convert.h>
+#include <pv/convert.h>
 
 using namespace std;
 using namespace std::tr1;

testApp/remote/testBeaconEmitter.cpp

@@ -2,10 +2,10 @@
  * testBeaconEmitter.cpp
  */
 
-#include "remote.h"
-#include "blockingUDP.h"
-#include "beaconEmitter.h"
-#include "inetAddressUtil.h"
+#include <pv/remote.h>
+#include <pv/blockingUDP.h>
+#include <pv/beaconEmitter.h>
+#include <pv/inetAddressUtil.h>
 
 #include <osiSock.h>
 

testApp/remote/testBeaconHandler.cpp

@@ -2,11 +2,11 @@
  * testBeaconEmitter.cpp
  */
 
-#include "remote.h"
-#include "blockingUDP.h"
-#include "beaconHandler.h"
-#include "inetAddressUtil.h"
-#include "introspectionRegistry.h"
+#include <pv/remote.h>
+#include <pv/blockingUDP.h>
+#include <pv/beaconHandler.h>
+#include <pv/inetAddressUtil.h>
+#include <pv/introspectionRegistry.h>
 
 #include <osiSock.h>
 

testApp/remote/testBlockingTCPClnt.cpp

@@ -5,15 +5,15 @@
  *      Author: Miha Vitorovic
  */
 
-#include "remote.h"
-#include "blockingTCP.h"
-#include "logger.h"
-#include "inetAddressUtil.h"
-#include "caConstants.h"
+#include <pv/remote.h>
+#include <pv/blockingTCP.h>
+#include <pv/logger.h>
+#include <pv/inetAddressUtil.h>
+#include <pv/caConstants.h>
 
-#include <timer.h>
-#include <epicsException.h>
-#include <pvType.h>
+#include <pv/timer.h>
+#include <pv/epicsException.h>
+#include <pv/pvType.h>
 
 #include <osiSock.h>
 #include <errlog.h>

testApp/remote/testBlockingTCPSrv.cpp

@@ -5,11 +5,11 @@
  *      Author: Miha Vitorovic
  */
 
-#include "blockingTCP.h"
-#include "remote.h"
-#include "logger.h"
-#include "configuration.h"
-#include "serverContext.h"
+#include <pv/blockingTCP.h>
+#include <pv/remote.h>
+#include <pv/logger.h>
+#include <pv/configuration.h>
+#include <pv/serverContext.h>
 
 #include <iostream>
 

testApp/remote/testBlockingUDPClnt.cpp

@@ -5,12 +5,12 @@
  *      Author: Miha Vitorovic
  */
 
-#include <remote.h>
-#include <blockingUDP.h>
-#include <logger.h>
-#include <inetAddressUtil.h>
+#include <pv/remote.h>
+#include <pv/blockingUDP.h>
+#include <pv/logger.h>
+#include <pv/inetAddressUtil.h>
 
-//#include <CDRMonitor.h>
+//#include <pv/CDRMonitor.h>
 
 #include <osiSock.h>
 

testApp/remote/testBlockingUDPSrv.cpp

@@ -5,10 +5,10 @@
  *      Author: Miha Vitorovic
  */
 
-#include "remote.h"
-#include "blockingUDP.h"
-#include "logger.h"
-#include "hexDump.h"
+#include <pv/remote.h>
+#include <pv/blockingUDP.h>
+#include <pv/logger.h>
+#include <pv/hexDump.h>
 
 #include <osiSock.h>
 

testApp/remote/testChannelSearchManager.cpp

@@ -1,9 +1,9 @@
 /* testChannelSearcManager.cpp */
 
 #include <epicsExit.h>
-#include <channelSearchManager.h>
+#include <pv/channelSearchManager.h>
 #include <sstream>
-#include <CDRMonitor.h>
+#include <pv/CDRMonitor.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

testApp/remote/testRemoteClientImpl.cpp

@@ -5,10 +5,10 @@
 
 #include <iostream>
 #include <sstream>
-#include <CDRMonitor.h>
+#include <pv/CDRMonitor.h>
 #include <epicsExit.h>
-#include <clientContextImpl.h>
-#include <clientFactory.h>
+#include <pv/clientContextImpl.h>
+#include <pv/clientFactory.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

testApp/remote/testServer.cpp

@@ -2,11 +2,11 @@
  * testServer.cpp
  */
 
-#include "serverContext.h"
-#include "clientContextImpl.h"
-#include <CDRMonitor.h>
+#include <pv/serverContext.h>
+#include <pv/clientContextImpl.h>
+#include <pv/CDRMonitor.h>
 #include <epicsExit.h>
-#include <standardPVField.h>
+#include <pv/standardPVField.h>
 
 using namespace epics::pvAccess;
 using namespace epics::pvData;

testApp/remote/testServerContext.cpp

@@ -2,8 +2,8 @@
  * testServerContext.cpp
  */
 
-#include "serverContext.h"
-#include <CDRMonitor.h>
+#include <pv/serverContext.h>
+#include <pv/CDRMonitor.h>
 #include <epicsExit.h>
 
 using namespace epics::pvAccess;

testApp/utils/configurationTest.cpp

@@ -3,8 +3,8 @@
  *
  */
 
-#include "configuration.h"
-#include "CDRMonitor.h"
+#include <pv/configuration.h>
+#include <pv/CDRMonitor.h>
 
 #include <epicsAssert.h>
 #include <epicsExit.h>

testApp/utils/hexDumpTest.cpp

@@ -5,7 +5,7 @@
  *      Author: Miha Vitorovic
  */
 
-#include <hexDump.h>
+#include <pv/hexDump.h>
 
 #include <iostream>
 

testApp/utils/inetAddressUtilsTest.cpp

@@ -5,11 +5,11 @@
  *      Author: user
  */
 
-#include <inetAddressUtil.h>
-#include <logger.h>
+#include <pv/inetAddressUtil.h>
+#include <pv/logger.h>
 
-#include <byteBuffer.h>
-#include <pvType.h>
+#include <pv/byteBuffer.h>
+#include <pv/pvType.h>
 
 #include <epicsAssert.h>
 #include <osiSock.h>

testApp/utils/introspectionRegistryTest.cpp

@@ -5,7 +5,7 @@
  *      Author: Gasper Jansa
  */
 
-#include "introspectionRegistry.h"
+#include <pv/introspectionRegistry.h>
 
 #include <epicsAssert.h>
 #include <epicsExit.h>
@@ -13,8 +13,8 @@
 #include <string>
 #include <sstream>
 #include <vector>
-#include <CDRMonitor.h>
-#include <convert.h>
+#include <pv/CDRMonitor.h>
+#include <pv/convert.h>
 
 using std::tr1::static_pointer_cast;
 

testApp/utils/loggerTest.cpp

@@ -5,7 +5,7 @@
  *      Author: Miha Vitorovic
  */
 
-#include <logger.h>
+#include <pv/logger.h>
 
 #include <errlog.h>
 #include <epicsExit.h>

testApp/utils/namedLockPatternTest.cpp

@@ -3,10 +3,10 @@
  *
  */
 
-#include "namedLockPattern.h"
-#include "inetAddressUtil.h"
-#include "status.h"
-#include "CDRMonitor.h"
+#include <pv/namedLockPattern.h>
+#include <pv/inetAddressUtil.h>
+#include <pv/status.h>
+#include <pv/CDRMonitor.h>
 
 
 #include <epicsAssert.h>

testApp/utils/transportRegistryTest.cpp

@@ -3,9 +3,9 @@
  *
  */
 
-#include "transportRegistry.h"
-#include "introspectionRegistry.h"
-#include "CDRMonitor.h"
+#include <pv/transportRegistry.h>
+#include <pv/introspectionRegistry.h>
+#include <pv/CDRMonitor.h>
 
 #include <epicsAssert.h>
 #include <epicsExit.h>

testApp/utils/wildcharMatcherTest.cpp

@@ -5,7 +5,7 @@
  *      Author: Miha Vitorovic
  */
 
-#include <wildcharMatcher.h>
+#include <pv/wildcharMatcher.h>
 
 #include <iostream>
 #include <epicsAssert.h>