Commit 8bfc3c8e authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[CHANGE] - renamed export defines to sound a little bit less Windows-specific...

[CHANGE] - renamed export defines to sound a little bit less Windows-specific (and therefore make this visual studio specific evil sound a little bit less evil)
parent 73fb4abb
......@@ -41,7 +41,7 @@
* \param line The line in the file.
* \param msg An optional message.
*/
void EXPORT_OWCOMMON_DLL wAssertFailed( std::string const& expression, std::string const& file, std::size_t line, std::string const& msg );
void OWCOMMON_EXPORT wAssertFailed( std::string const& expression, std::string const& file, std::size_t line, std::string const& msg );
//! the actual assertion macro
#define WAssert( e, msg ) ( ( e ) ? ( ( void )0 ) : ( wAssertFailed( #e, __FILE__, __LINE__, msg ) ) )
......
......@@ -36,7 +36,7 @@
/**
* Represents a RGBA Color
*/
class EXPORT_OWCOMMON_DLL WColor
class OWCOMMON_EXPORT WColor
{
public:
......
......@@ -35,7 +35,7 @@
* Class to encapsulate boost::condition_variable_any. You may use it to efficiently wait for events (a condition comes true). It
* is a very simple implementation. It might be extended easily. Timed wait functions and so on.
*/
class EXPORT_OWCOMMON_DLL WCondition // NOLINT
class OWCOMMON_EXPORT WCondition // NOLINT
{
friend class WCondition_test;
public:
......
......@@ -37,7 +37,7 @@
* on a mutex. All waiting threads try to get a read lock which is not possible as long it is write-locked. The notify method
* releases the write lock and all waiting threads can continue.
*/
class EXPORT_OWCOMMON_DLL WConditionOneShot: public WCondition
class OWCOMMON_EXPORT WConditionOneShot: public WCondition
{
friend class WConditionOneShot_test;
public:
......
......@@ -39,7 +39,7 @@
* conditions, this class can encapsulate multiple conditions and offer a wait() command to wait for one of them to change its
* state. Please not that this class can also be used as condition.
*/
class EXPORT_OWCOMMON_DLL WConditionSet: public WCondition
class OWCOMMON_EXPORT WConditionSet: public WCondition
{
friend class WConditionSetTest;
public:
......
......@@ -36,7 +36,7 @@
/**
* Basic exception handler.
*/
class EXPORT_OWCOMMON_DLL WException: public std::exception
class OWCOMMON_EXPORT WException: public std::exception
{
/**
* Only UnitTests are allowed to be a friend of this class.
......
......@@ -30,14 +30,14 @@
#pragma warning( disable: 4251 )
#ifdef OWcommon_EXPORTS
#define EXPORT_OWCOMMON_DLL __declspec( dllexport )
#define OWCOMMON_EXPORT __declspec( dllexport )
#else
#define EXPORT_OWCOMMON_DLL __declspec( dllimport )
#define OWCOMMON_EXPORT __declspec( dllimport )
#endif
#else
#define EXPORT_OWCOMMON_DLL
#define OWCOMMON_EXPORT
#endif // _MSC_VER
......
......@@ -50,7 +50,7 @@
* \param T the encapsulated type inside the flag. I.e. for WFlag< int32_t > use T=int32_t
*/
template < typename T >
class EXPORT_OWCOMMON_DLL WFlagForwarder // NOLINT
class OWCOMMON_EXPORT WFlagForwarder // NOLINT
{
public:
......
......@@ -33,7 +33,7 @@
* Container which associate values with (uniform width) bins (aka intervals or buckets). This class implements the abstract interface and
* therefore builds the base class for all histogram classes. The interface also allows programming histogram of different bucket sizes.
*/
class EXPORT_OWCOMMON_DLL WHistogram // NOLINT
class OWCOMMON_EXPORT WHistogram // NOLINT
{
public:
/**
......
......@@ -44,7 +44,7 @@ class WItemSelector;
* not implement any function that might change the item list. The would cause odd behaviour of all the WItemSelector instances. Items can only
* be added until the first Selector instance is created.
*/
class EXPORT_OWCOMMON_DLL WItemSelection: public boost::enable_shared_from_this< WItemSelection >
class OWCOMMON_EXPORT WItemSelection: public boost::enable_shared_from_this< WItemSelection >
{
public:
/**
......
......@@ -47,7 +47,7 @@
* \note the protected constructor avoids instance creation of classes not the WItemSelection. This is restrictive but needed. Nobody can create
* instances of it, changing the underlying WItemSelection and using it as selector for another ItemSelection instance.
*/
class EXPORT_OWCOMMON_DLL WItemSelector // NOLINT
class OWCOMMON_EXPORT WItemSelector // NOLINT
{
friend class WItemSelection;
public:
......
......@@ -45,7 +45,7 @@ LogLevel;
/**
* Represents a simple log message with some attributes.
*/
class EXPORT_OWCOMMON_DLL WLogEntry // NOLINT
class OWCOMMON_EXPORT WLogEntry // NOLINT
{
public:
......
......@@ -43,7 +43,7 @@
/**
* Does actual logging of WLogEntries down to stdout or something similar.
*/
class EXPORT_OWCOMMON_DLL WLogger: public WThreadedRunner
class OWCOMMON_EXPORT WLogger: public WThreadedRunner
{
public:
/**
......
......@@ -35,7 +35,7 @@
* Singleton class helping to find files and paths. It is a useful to to search for resources and the central place to "hardcode" relative paths.
* It contains global paths only. Modules have their OWN local paths.
*/
class EXPORT_OWCOMMON_DLL WPathHelper // NOLINT
class OWCOMMON_EXPORT WPathHelper // NOLINT
{
public:
......
......@@ -40,7 +40,7 @@
/**
* Fetches and caches preferences set in file.
*/
class EXPORT_OWCOMMON_DLL WPreferences
class OWCOMMON_EXPORT WPreferences
{
public:
/**
......
......@@ -38,7 +38,7 @@
*
* \see WGUI
*/
class EXPORT_OWCOMMON_DLL WProgress // NOLINT
class OWCOMMON_EXPORT WProgress // NOLINT
{
friend class WProgressTest;
public:
......
......@@ -37,7 +37,7 @@
* Base class for all kinds of progress combinations. You might want to derive from this class to implement some special progress
* combination.
*/
class EXPORT_OWCOMMON_DLL WProgressCombiner: public WProgress
class OWCOMMON_EXPORT WProgressCombiner: public WProgress
{
friend class WProgressCombinerTest;
public:
......
......@@ -33,7 +33,7 @@
* A base class for all parts of OpenWalnut which can be serialized to a project file. It is used by WProjectFile to actually parse the file line
* by line. Derive from this class if you write your own parser and use it to fill your internal data structures.
*/
class EXPORT_OWCOMMON_DLL WProjectFileIO // NOLINT
class OWCOMMON_EXPORT WProjectFileIO // NOLINT
{
public:
......
......@@ -47,7 +47,7 @@
* is the property with the name "property" in the group "you" which against is in the group "hello".
* \note The root group of each module does not have a name.
*/
class EXPORT_OWCOMMON_DLL WProperties: public WPropertyBase
class OWCOMMON_EXPORT WProperties: public WPropertyBase
{
friend class WPropertiesTest;
public:
......
......@@ -41,7 +41,7 @@
/**
* Abstract base class for all properties. Simply provides name and type information.
*/
class EXPORT_OWCOMMON_DLL WPropertyBase: public boost::enable_shared_from_this< WPropertyBase >
class OWCOMMON_EXPORT WPropertyBase: public boost::enable_shared_from_this< WPropertyBase >
{
public:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment