Skip to content

Support GNUC exporting #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Spartan322 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support GNUC exporting #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4110b30
Support GNUC exporting
Spartan322 Aug 16, 2016
724d303
Just Export is a very bad name, don't do that for macros please!!
Spartan322 Aug 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions src/ITMA.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,29 @@
#include <memory>
#include <mutex>

//Windows dll EXPORT definition
//TODO: add Cross-platform dynamic library macros
//_ITMA_EXPORT definition
#ifdef ITMA_EXPORT
#define EXPORT __declspec(dllexport)
# if defined(_WIN32)
# define _ITMA_EXPORT __declspec(dllexport)
# elif defined(__GNUC__)
# define _ITMA_EXPORT __attribute__((visibility("default")))
# else
# define _ITMA_EXPORT
# endif
#elif defined(_WIN32)
# define _ITMA_EXPORT __declspec(dllimport)
#else
#define EXPORT __declspec(dllimport)
# define _ITMA_EXPORT
#endif //MTMA_EXPORT

/* TODO: Make EXPORT macro compatible with Unix compilers for dynamic link library creation. */

#include "custom_vector.h"
#include "custom_queue.h"

namespace ITMA
{
class pipe;

class EXPORT MContext
class _ITMA_EXPORT MContext
{
std::thread context;
CustomVector<std::shared_ptr<pipe>> pipes;
Expand All @@ -46,7 +51,7 @@ namespace ITMA
};

//ZMQPP socket style setup
class EXPORT Channel
class _ITMA_EXPORT Channel
{
std::shared_ptr<pipe> pip;
MContext & _ctx;
Expand Down Expand Up @@ -144,7 +149,7 @@ namespace ITMA
}
};

class EXPORT pipe
class _ITMA_EXPORT pipe
{
CustomQueue<Message> in; //incoming messages
CustomQueue<Message> out; //outgoing messages
Expand Down Expand Up @@ -244,4 +249,4 @@ namespace ITMA

}//namespace MTMA

#endif //ITMA_HPP
#endif //ITMA_HPP