diff --git a/configure/RELEASE b/configure/RELEASE index f5e6898..07381c3 100644 --- a/configure/RELEASE +++ b/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: diff --git a/pvAccessApp/client/pvAccess.h b/pvAccessApp/client/pvAccess.h index b13e12e..640ac31 100644 --- a/pvAccessApp/client/pvAccess.h +++ b/pvAccessApp/client/pvAccess.h @@ -30,12 +30,6 @@ namespace epics { namespace pvAccess { class Channel; class ChannelProvider; -#define POINTER_DEFINITIONS(clazz) \ - typedef std::tr1::shared_ptr shared_pointer; \ - typedef std::tr1::shared_ptr const_shared_pointer; \ - typedef std::tr1::weak_ptr weak_pointer; \ - typedef std::tr1::weak_ptr const_weak_pointer; - /** * Base interface for all channel requests.