Win32 port: fix and success compile and run using GCC -fvisibility=hidden
This commit is contained in:
@@ -32,5 +32,7 @@ endif
|
||||
INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
|
||||
USR_INCLUDES += -I $(INSTALL_LOCATION)/include
|
||||
|
||||
#USR_CPPFLAGS=-fvisibility=hidden
|
||||
|
||||
-include $(TOP)/configure/CONFIG_SITE.local
|
||||
-include $(TOP)/../CONFIG.local
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <pv/serialize.h>
|
||||
#include <pv/sharedPtr.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
#define BYTEBUFFER_H
|
||||
|
||||
#include <string>
|
||||
#include <string.h>
|
||||
#include <pv/pvType.h>
|
||||
#include <pv/epicsException.h>
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <pv/sharedPtr.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
// Users may redefine this for a large size if desired
|
||||
#ifndef EXCEPT_DEPTH
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <pv/pvType.h>
|
||||
#include <pv/sharedPtr.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <pv/thread.h>
|
||||
#include <pv/sharedPtr.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <pv/lock.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
epicsShareExtern epics::pvData::Mutex& getLocalStaticInitMutex();
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
#include <pv/noDefaultMethods.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
/* This is based on item 14 of
|
||||
* Effective C++, Third Edition, Scott Meyers
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <pv/requester.h>
|
||||
#include <pv/queue.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#ifndef NO_DEFAULT_METHODS_H
|
||||
#define NO_DEFAULT_METHODS_H
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
/* This is based on Item 6 of
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <pv/pvType.h>
|
||||
#include <pv/sharedPtr.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <pv/byteBuffer.h>
|
||||
#include <pv/sharedPtr.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <pv/noDefaultMethods.h>
|
||||
#include <pv/pvIntrospect.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics {
|
||||
namespace pvData {
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <pv/byteBuffer.h>
|
||||
#include <pv/sharedPtr.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <pv/noDefaultMethods.h>
|
||||
#include <pv/pvType.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <pv/sharedPtr.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <pv/lock.h>
|
||||
#include <pv/sharedPtr.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
+14
-12
@@ -16,6 +16,8 @@
|
||||
#include <pv/pvIntrospect.h>
|
||||
#include <pv/templateMeta.h>
|
||||
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
typedef std::string String;
|
||||
@@ -23,17 +25,17 @@ typedef std::string String;
|
||||
namespace detail {
|
||||
// parseToPOD wraps the epicsParse*() functions in one name
|
||||
// and throws exceptions
|
||||
void parseToPOD(const std::string&, boolean *out);
|
||||
void parseToPOD(const std::string&, int8 *out);
|
||||
void parseToPOD(const std::string&, uint8 *out);
|
||||
void parseToPOD(const std::string&, int16_t *out);
|
||||
void parseToPOD(const std::string&, uint16_t *out);
|
||||
void parseToPOD(const std::string&, int32_t *out);
|
||||
void parseToPOD(const std::string&, uint32_t *out);
|
||||
void parseToPOD(const std::string&, int64_t *out);
|
||||
void parseToPOD(const std::string&, uint64_t *out);
|
||||
void parseToPOD(const std::string&, float *out);
|
||||
void parseToPOD(const std::string&, double *out);
|
||||
epicsShareExtern void parseToPOD(const std::string&, boolean *out);
|
||||
epicsShareExtern void parseToPOD(const std::string&, int8 *out);
|
||||
epicsShareExtern void parseToPOD(const std::string&, uint8 *out);
|
||||
epicsShareExtern void parseToPOD(const std::string&, int16_t *out);
|
||||
epicsShareExtern void parseToPOD(const std::string&, uint16_t *out);
|
||||
epicsShareExtern void parseToPOD(const std::string&, int32_t *out);
|
||||
epicsShareExtern void parseToPOD(const std::string&, uint32_t *out);
|
||||
epicsShareExtern void parseToPOD(const std::string&, int64_t *out);
|
||||
epicsShareExtern void parseToPOD(const std::string&, uint64_t *out);
|
||||
epicsShareExtern void parseToPOD(const std::string&, float *out);
|
||||
epicsShareExtern void parseToPOD(const std::string&, double *out);
|
||||
|
||||
/* want to pass POD types by value,
|
||||
* and String by const reference
|
||||
@@ -171,7 +173,7 @@ static FORCE_INLINE TO castUnsafe(const FROM& from)
|
||||
return detail::cast_helper<TO,FROM>::op(from);
|
||||
}
|
||||
|
||||
void castUnsafeV(size_t count, ScalarType to, void *dest, ScalarType from, const void *src);
|
||||
epicsShareExtern void castUnsafeV(size_t count, ScalarType to, void *dest, ScalarType from, const void *src);
|
||||
|
||||
//! Cast value to printable type
|
||||
//! A no-op except for int8 and uint8, which are cast to int
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <pv/sharedPtr.h>
|
||||
#include <pv/bitSet.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <pv/pvType.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#ifndef CONTROL_H
|
||||
#define CONTROL_H
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <pv/pvType.h>
|
||||
#include <pv/pvData.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <pv/alarm.h>
|
||||
#include <pv/pvData.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <pv/pvData.h>
|
||||
#include <pv/control.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <pv/pvData.h>
|
||||
#include <pv/display.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <pv/pvType.h>
|
||||
#include <pv/pvData.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <pv/pvData.h>
|
||||
#include <pv/timeStamp.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
#include <pv/pvType.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <pv/pvIntrospect.h>
|
||||
#include <pv/pvData.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
#include <pv/typeCast.h>
|
||||
#include <pv/sharedVector.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
#if defined(__vxworks) && !defined(_WRS_VXWORKS_MAJOR)
|
||||
typedef class std::ios std::ios_base;
|
||||
@@ -97,7 +97,7 @@ struct array_at_internal
|
||||
array_at_internal(std::size_t ix, std::ostream& str) : index(ix), stream(str) {}
|
||||
};
|
||||
|
||||
array_at_internal operator<<(std::ostream& str, array_at const& manip);
|
||||
epicsShareExtern array_at_internal operator<<(std::ostream& str, array_at const& manip);
|
||||
|
||||
};
|
||||
|
||||
@@ -500,7 +500,7 @@ protected:
|
||||
* Class that holds the data for each posssible scalar type.
|
||||
*/
|
||||
template<typename T>
|
||||
class PVScalarValue : public PVScalar {
|
||||
class epicsShareClass PVScalarValue : public PVScalar {
|
||||
public:
|
||||
POINTER_DEFINITIONS(PVScalarValue);
|
||||
typedef T value_type;
|
||||
@@ -1052,7 +1052,7 @@ private:
|
||||
};
|
||||
|
||||
|
||||
class PVUnion : public PVField
|
||||
class epicsShareClass PVUnion : public PVField
|
||||
{
|
||||
public:
|
||||
POINTER_DEFINITIONS(PVUnion);
|
||||
@@ -1338,7 +1338,7 @@ namespace detail {
|
||||
} // namespace detail
|
||||
|
||||
template<typename T>
|
||||
class PVValueArray : public detail::PVVectorStorage<T,PVScalarArray> {
|
||||
class epicsShareClass PVValueArray : public detail::PVVectorStorage<T,PVScalarArray> {
|
||||
typedef detail::PVVectorStorage<T,PVScalarArray> base_t;
|
||||
public:
|
||||
POINTER_DEFINITIONS(PVValueArray);
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <pv/byteBuffer.h>
|
||||
#include <pv/serialize.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
#include <pv/pvData.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
#include <pv/pvIntrospect.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <pv/pvData.h>
|
||||
#include <pv/standardField.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
/**
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <pv/pvData.h>
|
||||
#include <pv/bitSet.h>
|
||||
|
||||
#include <sharelib.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
namespace epics { namespace pvData {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user