Merged Windows port changes from default branch.

This commit is contained in:
Andrew Johnson
2014-04-16 16:29:12 -05:00
27 changed files with 196 additions and 43 deletions

View File

@@ -8,6 +8,7 @@
* @author mrk
* @date 2012.11.21
*/
#define epicsExportSharedSymbols
#include <pv/pvDatabase.h>

View File

@@ -11,15 +11,26 @@
#ifndef PVDATABASE_H
#define PVDATABASE_H
#ifdef epicsExportSharedSymbols
# define pvdatabaseEpicsExportSharedSymbols
# undef epicsExportSharedSymbols
#endif
#include <list>
#include <map>
#include <deque>
#include <shareLib.h>
#include <pv/pvData.h>
#include <pv/convert.h>
#ifdef pvdatabaseEpicsExportSharedSymbols
# define epicsExportSharedSymbols
# undef pvdatabaseEpicsExportSharedSymbols
# include <shareLib.h>
#endif
namespace epics { namespace pvDatabase {
class PVRecord;

View File

@@ -8,9 +8,12 @@
* @author mrk
* @date 2012.11.21
*/
#include <epicsThread.h>
#define epicsExportSharedSymbols
#include <pv/pvDatabase.h>
#include <epicsThread.h>
using std::tr1::static_pointer_cast;
using namespace epics::pvData;