now it compiles

This commit is contained in:
Matej Sekoranja
2010-11-03 12:46:22 +01:00
parent d1ad68c164
commit 980b53256e
5 changed files with 447 additions and 402 deletions

View File

@@ -1 +1,2 @@
pvAccessApp/client/pvAccess.h
pvAccessApp/client/pvAccess.h
pvAccessApp/client/ChannelAccessFactory.cpp

View File

@@ -2,5 +2,7 @@
include $(CONFIG)/RULES
USR_INCLUDES += -I$(PVDATA_HOME)/include
# Library should be rebuilt because LIBOBJS may have changed.
$(LIBNAME): ../Makefile

View File

@@ -0,0 +1,24 @@
/*ChannelAccessFactory.cpp*/
#include <lock.h>
#include "pvAccess.h"
#include "pvData.h"
#include "factory.h"
namespace epics { namespace pvAccess {
static ChannelAccess* channelAccess = 0;
ChannelAccess * getChannelAccess() {
static Mutex mutex = Mutex();
Lock guard(&mutex);
if(channelAccess==0){
//channelAccess = new ChannelAccessImpl();
}
return channelAccess;
}
}}

View File

@@ -4,6 +4,13 @@ include $(TOP)/configure/CONFIG
INC += pvAccess.h
LIBSRCS += ChannelAccessFactory.cpp
LIBRARY=pvAccessClient
pvAccessClient_LIBS += pvMisc
pvMisc_DIR = $(PVDATA_HOME)/lib/$(EPICS_HOST_ARCH)
include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE

File diff suppressed because it is too large Load Diff