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

merge feature/changesAfter3_0_2; resolve conflicts

Browse Source
This commit is contained in:
Marty Kraimer
2014-06-10 15:53:37 -04:00
parent 35429bf4df
commit 92be294bbf
87 changed files with 561 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
exampleServer/src/exampleServerRegister.cpp
View File

@@ -27,14 +27,13 @@
#include <epicsThread.h>
#include <iocsh.h>
#include <epicsExport.h>
#include <pv/pvIntrospect.h>
#include <pv/pvData.h>
#include <pv/pvAccess.h>
#include <pv/pvDatabase.h>
#include <epicsExport.h>
#include <exampleServer.h>
#include <pv/exampleServer.h>
using namespace epics::pvData;
using namespace epics::pvAccess;
@@ -65,7 +64,4 @@ static void exampleServerRegister(void)
iocshRegister(&exampleServerFuncDef, exampleServerCallFunc);
}
}
extern "C" {
epicsExportRegistrar(exampleServerRegister);
}
epicsExportRegistrar(exampleServerRegister);