Skip to content

Bugfix: Macro INTERNAL conflict with gRPC header status contant defin… #23

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

Closed
wants to merge 1 commit into from
Closed

Bugfix: Macro INTERNAL conflict with gRPC header status contant defin… #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions include/mysqlx/common/api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,16 +165,16 @@ MYSQLX_ABI_END(2,0)

#if defined CONCPP_BUILD_SHARED
#define PUBLIC_API DLL_EXPORT
#define INTERNAL DLL_LOCAL
#define INTERNAL_API DLL_LOCAL
#elif defined CONCPP_BUILD_STATIC
#define PUBLIC_API
#define INTERNAL
#define INTERNAL_API
#elif !defined STATIC_CONCPP
#define PUBLIC_API DLL_IMPORT
#define INTERNAL
#define INTERNAL_API
#else
#define PUBLIC_API
#define INTERNAL
#define INTERNAL_API
#endif


Expand Down
2 changes: 1 addition & 1 deletion include/mysqlx/devapi/detail/result.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ class PUBLIC_API Column_detail
friend Result_detail;
friend RowResult;

struct INTERNAL Access;
struct INTERNAL_API Access;
friend Access;
};

Expand Down
2 changes: 1 addition & 1 deletion include/mysqlx/devapi/detail/row.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class PUBLIC_API Row_detail
{
protected:

class INTERNAL Impl;
class INTERNAL_API Impl;
DLL_WARNINGS_PUSH
std::shared_ptr<Impl> m_impl;
DLL_WARNINGS_POP
Expand Down
6 changes: 3 additions & 3 deletions include/mysqlx/devapi/detail/session.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ struct PUBLIC_API Client_detail
common::Shared_session_pool& get_session_pool();


struct INTERNAL Impl;
struct INTERNAL_API Impl;

DLL_WARNINGS_PUSH
Shared_client_impl m_impl = NULL;
Expand Down Expand Up @@ -351,7 +351,7 @@ struct PUBLIC_API Session_detail
}


struct INTERNAL Impl;
struct INTERNAL_API Impl;

/*
Note: Session implementation is shared with result objects because it
Expand Down Expand Up @@ -394,7 +394,7 @@ struct PUBLIC_API Session_detail
return *m_impl;
}

INTERNAL cdk::Session& get_cdk_session();
INTERNAL_API cdk::Session& get_cdk_session();

void close();

Expand Down
6 changes: 3 additions & 3 deletions include/mysqlx/devapi/document.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@ class PUBLIC_API DbDoc
{
// TODO: move PUBLIC_API stuff to a detail class

class INTERNAL Impl;
class INTERNAL_API Impl;

DLL_WARNINGS_PUSH

std::shared_ptr<Impl> m_impl;

DLL_WARNINGS_POP

INTERNAL DbDoc(const std::shared_ptr<Impl>&);
INTERNAL_API DbDoc(const std::shared_ptr<Impl>&);

const char* get_json() const;

Expand Down Expand Up @@ -517,7 +517,7 @@ class Value
friend mysqlx::string;
///@endcond IGNORE

struct INTERNAL Access;
struct INTERNAL_API Access;
friend Access;
};

Expand Down
2 changes: 1 addition & 1 deletion include/mysqlx/devapi/result.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ class Column
public:

friend RowResult;
struct INTERNAL Access;
struct INTERNAL_API Access;
friend Access;
};

Expand Down