don't import/export inline classes

This commit is contained in:
Michael Davidsaver
2017-07-18 14:32:42 +02:00
parent 4d4dbcda4d
commit dbae173399
3 changed files with 13 additions and 15 deletions

View File

@@ -33,7 +33,7 @@ typedef epicsMutex Mutex;
* This is based on item 14 of
* * Effective C++, Third Edition, Scott Meyers
*/
class epicsShareClass Lock : private NoDefaultMethods {
class Lock : private NoDefaultMethods {
public:
/**
* Constructor

View File

@@ -21,20 +21,18 @@ namespace epics { namespace pvData {
*
* Note that copy constructor a copy methods are declared private.
*/
class epicsShareClass NoDefaultMethods {
protected:
/**
* Constructor
*/
NoDefaultMethods(){};
/**
* Destructor
*/
~NoDefaultMethods(){}
private:
class NoDefaultMethods {
public:
NoDefaultMethods() {}
private:
#if __cplusplus>=201103L
NoDefaultMethods(const NoDefaultMethods&) = delete;
NoDefaultMethods & operator=(const NoDefaultMethods &) = delete;
#else
// do not implement
NoDefaultMethods(const NoDefaultMethods&);
NoDefaultMethods & operator=(const NoDefaultMethods &);
#endif
};
}}

View File

@@ -43,7 +43,7 @@ typedef epicsThreadRunable Runnable;
//! Helper for those cases where a class should have more than one runnable
template<typename C>
class epicsShareClass RunnableMethod : public Runnable, private NoDefaultMethods
class RunnableMethod : public Runnable, private NoDefaultMethods
{
typedef void (C::*meth_t)();
C *inst;
@@ -104,7 +104,7 @@ struct BindRunner : public epicsThreadRunable
* @brief C++ wrapper for epicsThread from EPICS base.
*
*/
class epicsShareClass Thread : public epicsThread, private NoDefaultMethods {
class Thread : public epicsThread, private NoDefaultMethods {
public:
/** @brief Holds all the configuration necessary to launch a @class Thread
*
@@ -133,7 +133,7 @@ public:
<<"example"<<1);
@endcode
*/
class epicsShareClass Config
class Config
{
unsigned int p_prio, p_stack;
std::ostringstream p_strm;