Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up of debug.h: just use LL_COMMON_API.

Browse Source
This commit is contained in:
Aleric Inglewood
2012-08-09 06:57:53 +02:00
parent 37c8ea54eb
commit b9673df961
1 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
indra/cwdebug/debug.h
View File

@@ -29,26 +29,6 @@
#ifdef DEBUG_CURLIO #ifdef DEBUG_CURLIO
#if LL_WINDOWS
#define CWD_DLLEXPORT __declspec(dllexport)
#define CWD_DLLIMPORT __declspec(dllimport)
#elif LL_LINUX
#define CWD_DLLEXPORT __attribute__ ((visibility("default")))
#define CWD_DLLIMPORT
#else
#define CWD_DLLEXPORT
#define CWD_DLLIMPORT
#endif // LL_WINDOWS
#if LL_COMMON_LINK_SHARED
#if defined(llcommon_EXPORTS)
#define CWD_API CWD_DLLEXPORT
#else // cwdebug_EXPORTS
#define CWD_API CWD_DLLIMPORT
#endif // cwdebug_EXPORTS
#else // LL_COMMON_LINK_SHARED
#error LL_COMMON_LINK_SHARED not defined
#endif // LL_COMMON_LINK_SHARED
#include "aithreadid.h" #include "aithreadid.h"
// If CWDEBUG is not defined, but DEBUG_CURLIO is, then replace // If CWDEBUG is not defined, but DEBUG_CURLIO is, then replace
@@ -59,10 +39,11 @@
#include <string> #include <string>
#if LL_WINDOWS #if LL_WINDOWS
#define CWD_API_TLS __declspec(thread) // On windows, thread-local data is automatically exported.
#define LL_COMMON_API_TLS __declspec(thread)
#define CWD_TLS __declspec(thread) #define CWD_TLS __declspec(thread)
#else #else
#define CWD_API_TLS CWD_API __thread #define LL_COMMON_API_TLS LL_COMMON_API __thread
#define CWD_TLS __thread #define CWD_TLS __thread
#endif #endif
@@ -81,17 +62,17 @@ inline void init() { }
struct libcwd_do_type { struct libcwd_do_type {
void on() const { } void on() const { }
}; };
extern CWD_API libcwd_do_type const libcw_do; extern LL_COMMON_API libcwd_do_type const libcw_do;
struct Indent { struct Indent {
int M_indent; int M_indent;
static CWD_API_TLS int S_indentation; static LL_COMMON_API_TLS int S_indentation;
enum CWD_API print_nt { print }; enum LL_COMMON_API print_nt { print };
CWD_API Indent(int indent) : M_indent(indent) { S_indentation += M_indent; } LL_COMMON_API Indent(int indent) : M_indent(indent) { S_indentation += M_indent; }
CWD_API ~Indent() { S_indentation -= M_indent; } LL_COMMON_API ~Indent() { S_indentation -= M_indent; }
}; };
extern CWD_API std::ostream& operator<<(std::ostream& os, libcwd::buf2str const& b2s); extern LL_COMMON_API std::ostream& operator<<(std::ostream& os, libcwd::buf2str const& b2s);
extern CWD_API std::ostream& operator<<(std::ostream& os, Indent::print_nt); extern LL_COMMON_API std::ostream& operator<<(std::ostream& os, Indent::print_nt);
namespace dc { namespace dc {