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

[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:
......
......@@ -50,7 +50,7 @@ namespace WPropertyHelper
*
* \param prop the property where to add the constraint.
*/
void EXPORT_OWCOMMON_DLL addTo( WPropSelection prop );
void OWCOMMON_EXPORT addTo( WPropSelection prop );
}
/**
......@@ -63,21 +63,21 @@ namespace WPropertyHelper
*
* \param prop the property where to add the constraint.
*/
void EXPORT_OWCOMMON_DLL addTo( WPropSelection prop );
void OWCOMMON_EXPORT addTo( WPropSelection prop );
/**
* Add the PC_NOTEMPTY constraint to the property.
*
* \param prop the property where to add the constraint.
*/
void EXPORT_OWCOMMON_DLL addTo( WPropString prop );
void OWCOMMON_EXPORT addTo( WPropString prop );
/**
* Add the PC_NOTEMPTY constraint to the property.
*
* \param prop the property where to add the constraint.
*/
void EXPORT_OWCOMMON_DLL addTo( WPropFilename prop );
void OWCOMMON_EXPORT addTo( WPropFilename prop );
}
/**
......@@ -90,7 +90,7 @@ namespace WPropertyHelper
*
* \param prop the property where to add the constraint.
*/
void EXPORT_OWCOMMON_DLL addTo( WPropFilename prop );
void OWCOMMON_EXPORT addTo( WPropFilename prop );
}
/**
......@@ -103,7 +103,7 @@ namespace WPropertyHelper
*
* \param prop the property where to add the constraint.
*/
void EXPORT_OWCOMMON_DLL addTo( WPropFilename prop );
void OWCOMMON_EXPORT addTo( WPropFilename prop );
}
}
......
......@@ -34,7 +34,7 @@
/**
* Interface class for the concept "Prototype". The requirements are a zero-parameter constructor.
*/
class EXPORT_OWCOMMON_DLL WPrototyped // NOLINT
class OWCOMMON_EXPORT WPrototyped // NOLINT
{
public:
......
......@@ -77,7 +77,7 @@ private:
* recoverable, which means it can NOT be catched!
* Also note that this will only work on Linux.
*/
class EXPORT_OWCOMMON_DLL WSegmentationFault: public WException
class OWCOMMON_EXPORT WSegmentationFault: public WException
{
public:
......
......@@ -41,7 +41,7 @@
* \warning Because the POSIX standard does not enforce thread safety for the functions dlopen, dlclose, dlerror, and dlsym, these should not
* be used simultaneously with variables of this class.
*/
class EXPORT_OWCOMMON_DLL WSharedLib // NOLINT
class OWCOMMON_EXPORT WSharedLib // NOLINT
{
public:
......
......@@ -65,7 +65,7 @@ namespace string_utils
* - <tt>\\t</tt> tab
* - <tt>' '</tt> space
*/
extern EXPORT_OWCOMMON_DLL const std::string WHITESPACE;
extern OWCOMMON_EXPORT const std::string WHITESPACE;
/**
* Trims any occurence of each character given in parameter t from the end
......@@ -76,7 +76,7 @@ namespace string_utils
* \return A copy of the trimmed string
*/
std::string EXPORT_OWCOMMON_DLL rTrim( const std::string& source, const std::string& t = WHITESPACE );
std::string OWCOMMON_EXPORT rTrim( const std::string& source, const std::string& t = WHITESPACE );
/**
* Trims any occurence of each character given in parameter t from the
......@@ -86,7 +86,7 @@ namespace string_utils
* \param t String representing a set containg all trimmable characters
* \return A copy of the trimmed string
*/
std::string EXPORT_OWCOMMON_DLL lTrim( const std::string& source, const std::string& t =
std::string OWCOMMON_EXPORT lTrim( const std::string& source, const std::string& t =
WHITESPACE );
/**
......@@ -97,7 +97,7 @@ namespace string_utils
* \param t String representing a set containg all trimmable characters
* \return A copy of the trimmed string
*/
std::string EXPORT_OWCOMMON_DLL trim( const std::string& source, const std::string& t = WHITESPACE );
std::string OWCOMMON_EXPORT trim( const std::string& source, const std::string& t = WHITESPACE );
/**
* Transforms all characters in the given string into upper case
......@@ -106,7 +106,7 @@ namespace string_utils
* \param source String to transpose.
* \return A copy of the upper case only string
*/
std::string EXPORT_OWCOMMON_DLL toUpper( const std::string& source );
std::string OWCOMMON_EXPORT toUpper( const std::string& source );
/**
* Transforms all characters in the given string into lower case
......@@ -115,7 +115,7 @@ namespace string_utils
* \param source String to transpose.
* \return A copy of the lower case only string
*/
std::string EXPORT_OWCOMMON_DLL toLower( const std::string& source );
std::string OWCOMMON_EXPORT toLower( const std::string& source );
/**
* Splits the given string into a vector of strings (so called tokens).
......@@ -127,7 +127,7 @@ namespace string_utils
* as whitespace.
* \return A vector of strings containing the tokens.
*/
std::vector< std::string > EXPORT_OWCOMMON_DLL tokenize( const std::string& source,
std::vector< std::string > OWCOMMON_EXPORT tokenize( const std::string& source,
const std::string& delim = WHITESPACE,
bool compress = true );
......
......@@ -32,7 +32,7 @@
/**
* Helper class to provide a convenient way to colorize output on the console.
*/
class EXPORT_OWCOMMON_DLL WTerminalColor // NOLINT
class OWCOMMON_EXPORT WTerminalColor // NOLINT
{
friend class WTerminalColorTest;
public:
......
......@@ -38,7 +38,7 @@
/**
* Base class for all classes needing to be executed in a separate thread.
*/
class EXPORT_OWCOMMON_DLL WThreadedRunner // NOLINT
class OWCOMMON_EXPORT WThreadedRunner // NOLINT
{
public:
......
......@@ -34,7 +34,7 @@
*
* \ingroup Kernel
*/
class EXPORT_OWCOMMON_DLL WTransferable: public WPrototyped
class OWCOMMON_EXPORT WTransferable: public WPrototyped
{
public:
......
......@@ -39,7 +39,7 @@
* The reason why this is named DXt look up table is, since is it used as
* look up table for dSt and dLt fiber distance metrics.
*/
class EXPORT_OWCOMMON_DLL WDXtLookUpTable
class OWCOMMON_EXPORT WDXtLookUpTable
{
friend class WDXtLookUpTableTest;
public:
......
......@@ -41,7 +41,7 @@ namespace wmath
/**
* Represents a neural pathway.
*/
class EXPORT_OWCOMMON_DLL WFiber : public WLine
class OWCOMMON_EXPORT WFiber : public WLine
{
friend class WFiberTest;
public:
......
......@@ -42,7 +42,7 @@
/**
* A triangle consisting of 3 id of vertices that represent its corners
*/
struct EXPORT_OWCOMMON_DLL Triangle
struct OWCOMMON_EXPORT Triangle
{
size_t pointID[3]; //!< the ID of the vertices representing the triangle corners
......@@ -75,7 +75,7 @@ namespace tm_utils
*
* \return List of components where each of them is a WTriangleMesh again.
*/
boost::shared_ptr< std::list< boost::shared_ptr< WTriangleMesh > > > EXPORT_OWCOMMON_DLL componentDecomposition( const WTriangleMesh& mesh );
boost::shared_ptr< std::list< boost::shared_ptr< WTriangleMesh > > > OWCOMMON_EXPORT componentDecomposition( const WTriangleMesh& mesh );
/**
* Prints for each mesh \#vertices and \#triangles, as well as each triangle with its positions. No point IDs are printed.
......@@ -91,7 +91,7 @@ namespace tm_utils
/**
* Triangle mesh data structure allowing for convenient access of the elements.
*/
class EXPORT_OWCOMMON_DLL WTriangleMesh : public WTransferable
class OWCOMMON_EXPORT WTriangleMesh : public WTransferable
{
/**
* Only UnitTests may be friends.
......
......@@ -70,7 +70,7 @@
dset.find_set( u ); // find the set owning u. A representative of the set is returned
\endverbatim
*/
class EXPORT_OWCOMMON_DLL WUnionFind
class OWCOMMON_EXPORT WUnionFind
{
friend class WUnionFindTest;
public:
......
......@@ -33,7 +33,7 @@
/**
* Thrown whenever a file was not found.
*/
class EXPORT_OWCOMMON_DLL WFileNotFound : public WException
class OWCOMMON_EXPORT WFileNotFound : public WException
{
public:
/**
......
......@@ -33,7 +33,7 @@
/**
* Thrown whenever a file could not be opened.
*/
class EXPORT_OWCOMMON_DLL WFileOpenFailed : public WException
class OWCOMMON_EXPORT WFileOpenFailed : public WException
{
public:
/**
......
......@@ -33,7 +33,7 @@
/**
* Thrown whenever a symbol could not be fetched.
*/
class EXPORT_OWCOMMON_DLL WLibraryFetchFailed : public WException
class OWCOMMON_EXPORT WLibraryFetchFailed : public WException
{
public:
......
......@@ -33,7 +33,7 @@
/**
* Thrown whenever a library could not been loaded. This may be caused by a file not found error or link errors.
*/
class EXPORT_OWCOMMON_DLL WLibraryLoadFailed : public WException
class OWCOMMON_EXPORT WLibraryLoadFailed : public WException
{
public:
/**
......
......@@ -33,7 +33,7 @@
/**
* Indicates invalid element access of a container.
*/
class EXPORT_OWCOMMON_DLL WNotImplemented : public WException
class OWCOMMON_EXPORT WNotImplemented : public WException
{
public:
/**
......
......@@ -33,7 +33,7 @@
/**
* Indicates invalid element access of a container.
*/
class EXPORT_OWCOMMON_DLL WOutOfBounds : public WException
class OWCOMMON_EXPORT WOutOfBounds : public WException
{
public:
/**
......
......@@ -33,7 +33,7 @@
/**
* Indicates invalid property name.
*/
class EXPORT_OWCOMMON_DLL WPropertyNameMalformed : public WException
class OWCOMMON_EXPORT WPropertyNameMalformed : public WException
{
public:
/**
......
......@@ -33,7 +33,7 @@
/**
* Indicates that a given property is not unique in a group of properties.
*/
class EXPORT_OWCOMMON_DLL WPropertyNotUnique : public WException
class OWCOMMON_EXPORT WPropertyNotUnique : public WException
{
public:
/**
......
......@@ -33,7 +33,7 @@
/**
* Indicates invalid element access of a container.
*/
class EXPORT_OWCOMMON_DLL WPropertyUnknown : public WException
class OWCOMMON_EXPORT WPropertyUnknown : public WException
{
public:
/**
......
......@@ -42,7 +42,7 @@ namespace wmath
* A line is an ordered sequence of WPositions.
*/
// typedef WMixinVector< WPosition > WLine;
class EXPORT_OWCOMMON_DLL WLine : public WMixinVector< WPosition >
class OWCOMMON_EXPORT WLine : public WMixinVector< WPosition >
{
public:
/**
......
......@@ -39,7 +39,7 @@ namespace wmath
* \param mat 3x3 matrix
* \param vec vector
*/
WVector3D EXPORT_OWCOMMON_DLL multMatrixWithVector3D( WMatrix<double> mat, WVector3D vec );
WVector3D OWCOMMON_EXPORT multMatrixWithVector3D( WMatrix<double> mat, WVector3D vec );
/**
* Applies a coordinate transformation in homogenous coordinates to a vector.
......@@ -48,7 +48,7 @@ namespace wmath
* \param mat 4x4 matrix
* \param vec vector
*/
WVector3D EXPORT_OWCOMMON_DLL transformVector3DWithMatrix4D( WMatrix<double> mat, WVector3D vec );
WVector3D OWCOMMON_EXPORT transformVector3DWithMatrix4D( WMatrix<double> mat, WVector3D vec );
/**
* Applies a coordinate transformation in homogenous coordinates to a position.
......@@ -57,7 +57,7 @@ namespace wmath
* \param mat 4x4 matrix
* \param vec vector
*/
WVector3D EXPORT_OWCOMMON_DLL transformPosition3DWithMatrix4D( WMatrix<double> mat, WPosition vec );
WVector3D OWCOMMON_EXPORT transformPosition3DWithMatrix4D( WMatrix<double> mat, WPosition vec );
/**
* helper routine to invert a 3x3 matrix
......@@ -66,7 +66,7 @@ namespace wmath
*
* \return inverted 3x3 matrix
*/
WMatrix<double> EXPORT_OWCOMMON_DLL invertMatrix3x3( WMatrix<double> mat );
WMatrix<double> OWCOMMON_EXPORT invertMatrix3x3( WMatrix<double> mat );
/**
* helper routine to invert a 4x4 matrix
......@@ -75,7 +75,7 @@ namespace wmath
*
* \return inverted 4x4 matrix
*/
WMatrix<double> EXPORT_OWCOMMON_DLL invertMatrix4x4( WMatrix<double> mat );
WMatrix<double> OWCOMMON_EXPORT invertMatrix4x4( WMatrix<double> mat );
/**
* Checks if the given two vectors are linearly independent.
......@@ -87,7 +87,7 @@ namespace wmath
*
* \note This check is performed with the cross product != (0,0,0) but in numerical stability with FLT_EPS.
*/
bool EXPORT_OWCOMMON_DLL linearIndependent( const wmath::WVector3D& u, const wmath::WVector3D& v );
bool OWCOMMON_EXPORT linearIndependent( const wmath::WVector3D& u, const wmath::WVector3D& v );
}
#endif // WLINEARALGEBRAFUNCTIONS_H
......@@ -38,7 +38,7 @@ namespace wmath
* Class for symmetric spherical harmonics
* The index scheme of the coefficients/basis values is like in the Descoteaux paper "Regularized, Fast, and Robust Analytical Q-Ball Imaging".
*/
class EXPORT_OWCOMMON_DLL WSymmetricSphericalHarmonic // NOLINT
class OWCOMMON_EXPORT WSymmetricSphericalHarmonic // NOLINT
{
// TODO(all): implement test
// friend class WSymmetricSphericalHarmonicTest;
......
......@@ -36,7 +36,7 @@ namespace wmath
/**
* This class stores coordinates on the unit sphere.
*/
class EXPORT_OWCOMMON_DLL WUnitSphereCoordinates // NOLINT
class OWCOMMON_EXPORT WUnitSphereCoordinates // NOLINT
{
// TODO(all): implement test
// friend class WUnitSphereCoordinatesTest;
......
......@@ -40,7 +40,7 @@ namespace wmath
/**
* Efficient three-dimensional vector that allows many vector algebra operations
*/
class EXPORT_OWCOMMON_DLL WVector3D : public WValue< double >
class OWCOMMON_EXPORT WVector3D : public WValue< double >
{
/**
* Only UnitTests are allowed to be friends of this class
......
......@@ -30,14 +30,14 @@
#pragma warning( disable: 4251 )
#ifdef OWge_EXPORTS
#define EXPORT_OWGE_DLL __declspec( dllexport )
#define WGE_EXPORT __declspec( dllexport )
#else
#define EXPORT_OWGE_DLL __declspec( dllimport )
#define WGE_EXPORT __declspec( dllimport )