merge feature/changesAfter3_0_2; resolve conflicts

exampleServer/src/Makefile

@@ -3,8 +3,14 @@ TOP=..
 include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
+#=============================
 
-DBD += exampleServerRegister.dbd
+#==================================================
+# Build an IOC support library
+#
+
+
+DBD += exampleServer.dbd
 
 INC += exampleServer.h
 
@@ -14,6 +20,7 @@ exampleServer_SRCS += exampleServerRegister.cpp
 exampleServer_LIBS += pvDatabase
 exampleServer_LIBS += pvAccess
 exampleServer_LIBS += pvData
+exampleServer_LIBS += Com
 exampleServer_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 PROD_HOST += exampleServerMain

exampleServer/src/exampleServer.cpp

@@ -10,10 +10,7 @@
  */
 
 #include <pv/standardPVField.h>
-
-#define epicsExportSharedSymbols
-
-#include <exampleServer.h>
+#include <pv/exampleServer.h>
 
 namespace epics { namespace exampleServer { 
 using namespace epics::pvData;

exampleServer/src/exampleServer.h

@@ -8,26 +8,15 @@
  * @author mrk
  * @date 2013.04.02
  */
-#ifndef EXAMPLESERVER_H
-#define EXAMPLESERVER_H
-
-#ifdef epicsExportSharedSymbols
-#   define exampleServerEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#ifndef EXAMPLECOUNTER_H
+#define EXAMPLECOUNTER_H
 
 #include <shareLib.h>
+
 #include <pv/pvDatabase.h>
 #include <pv/timeStamp.h>
 #include <pv/pvTimeStamp.h>
 
-#ifdef exampleServerEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef exampleServerEpicsExportSharedSymbols
-#   include <shareLib.h>
-#endif
-
-
 namespace epics { namespace exampleServer { 
 
 
@@ -58,4 +47,4 @@ private:
 
 }}
 
-#endif  /* EXAMPLESERVER_H */
+#endif  /* EXAMPLECOUNTER_H */

exampleServer/src/exampleServerInclude.dbd

@@ -0,0 +1 @@
+registrar("exampleServerRegister")

exampleServer/src/exampleServerMain.cpp

@@ -20,12 +20,11 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
+#include <pv/exampleServer.h>
 #include <pv/traceRecord.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/serverContext.h>
 
-#include <exampleServer.h>
-
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

exampleServer/src/exampleServerRegister.cpp

@@ -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);