Commit 7f93a5a4 authored by whitlocb's avatar whitlocb

I fixed a visibility problem with exceptions when compiling with -fvisibility=hidden.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@9720 18c085ea-50e0-402c-830e-de6fd14e8384
parent 9b7c87e3
......@@ -59,7 +59,7 @@
//
// ****************************************************************************
class VISWINDOW_API BadColleagueException : public VisWindowException
class VISWINDOW_API2 BadColleagueException : public VisWindowException
{
public:
BadColleagueException();
......
......@@ -60,7 +60,7 @@
//
// ****************************************************************************
class VISWINDOW_API BadInteractorException : public VisWindowException
class VISWINDOW_API2 BadInteractorException : public VisWindowException
{
public:
BadInteractorException(INTERACTION_MODE);
......
......@@ -58,7 +58,7 @@
//
// ****************************************************************************
class VISWINDOW_API BadPlotException : public VisWindowException
class VISWINDOW_API2 BadPlotException : public VisWindowException
{
public:
BadPlotException();
......
......@@ -60,7 +60,7 @@
//
// ****************************************************************************
class VISWINDOW_API BadWindowModeException : public VisWindowException
class VISWINDOW_API2 BadWindowModeException : public VisWindowException
{
public:
BadWindowModeException(WINDOW_MODE);
......
......@@ -61,7 +61,7 @@
//
// ****************************************************************************
class VISWINDOW_API PlotDimensionalityException : public VisWindowException
class VISWINDOW_API2 PlotDimensionalityException : public VisWindowException
{
public:
PlotDimensionalityException(WINDOW_MODE, WINDOW_MODE, int);
......
......@@ -61,7 +61,7 @@
//
// ****************************************************************************
class VISWINDOW_API VisWindowException : public VisItException
class VISWINDOW_API2 VisWindowException : public VisItException
{
public:
~VisWindowException() VISIT_THROW_NOTHING {;};
......
......@@ -41,9 +41,11 @@
#if defined(_WIN32)
#if defined(VISWINDOW_EXPORTS) || defined(avtviswindow_ser_EXPORTS) || defined(avtviswindow_par_EXPORTS)
#define VISWINDOW_API __declspec(dllexport)
#define VISWINDOW_API __declspec(dllexport)
#define VISWINDOW_API2 __declspec(dllexport)
#else
#define VISWINDOW_API __declspec(dllimport)
#define VISWINDOW_API __declspec(dllimport)
#define VISWINDOW_API2 __declspec(dllimport)
#endif
#if defined(_MSC_VER)
// Turn off warning about lack of DLL interface
......@@ -54,10 +56,16 @@
#pragma warning(disable:4786)
#endif
#else
# if __GNUC__ >= 4 && (defined(VISWINDOW_EXPORTS) || defined(avtviswindow_ser_EXPORTS) || defined(avtviswindow_par_EXPORTS))
# define VISWINDOW_API __attribute__ ((visibility("default")))
# if __GNUC__ >= 4
# if (defined(VISWINDOW_EXPORTS) || defined(avtviswindow_ser_EXPORTS) || defined(avtviswindow_par_EXPORTS))
# define VISWINDOW_API __attribute__ ((visibility("default")))
# else
# define VISWINDOW_API /* hidden by default */
# endif
# define VISWINDOW_API2 __attribute__ ((visibility("default"))) /* Always visible */
# else
# define VISWINDOW_API /* hidden by default */
# define VISWINDOW_API /* hidden by default */
# define VISWINDOW_API2 /* hidden by default */
# endif
#endif
......
......@@ -57,7 +57,7 @@
//
// *******************************************************************
class COMM_API BadHostException : public VisItException
class COMM_API2 BadHostException : public VisItException
{
public:
BadHostException(const std::string &host);
......
......@@ -55,7 +55,7 @@
//
// ****************************************************************************
class COMM_API CancelledConnectException : public VisItException
class COMM_API2 CancelledConnectException : public VisItException
{
public:
CancelledConnectException() {;};
......
......@@ -58,7 +58,7 @@
//
// ****************************************************************************
class COMM_API ChangeUsernameException : public VisItException
class COMM_API2 ChangeUsernameException : public VisItException
{
public:
ChangeUsernameException() {;};
......
......@@ -54,7 +54,7 @@
//
// ****************************************************************************
class COMM_API CouldNotConnectException : public VisItException
class COMM_API2 CouldNotConnectException : public VisItException
{
public:
CouldNotConnectException() {;};
......
......@@ -57,7 +57,7 @@
//
// ****************************************************************************
class COMM_API IncompatibleSecurityTokenException : public VisItException
class COMM_API2 IncompatibleSecurityTokenException : public VisItException
{
public:
IncompatibleSecurityTokenException() {;};
......
......@@ -57,7 +57,7 @@
//
// ****************************************************************************
class COMM_API IncompatibleVersionException : public VisItException
class COMM_API2 IncompatibleVersionException : public VisItException
{
public:
IncompatibleVersionException() {;};
......
......@@ -56,7 +56,7 @@
//
// ****************************************************************************
class COMM_API LostConnectionException : public VisItException
class COMM_API2 LostConnectionException : public VisItException
{
public:
LostConnectionException() {;};
......
......@@ -42,9 +42,11 @@
#if defined(_WIN32)
# define DESCRIPTOR unsigned int
# if defined(COMM_EXPORTS) || defined(visitcommon_EXPORTS)
# define COMM_API __declspec(dllexport)
# define COMM_API __declspec(dllexport)
# define COMM_API2 __declspec(dllexport)
# else
# define COMM_API __declspec(dllimport)
# define COMM_API __declspec(dllimport)
# define COMM_API2 __declspec(dllimport)
# endif
# if defined(_MSC_VER)
// Turn off warning about lack of DLL interface
......@@ -56,10 +58,16 @@
# endif
#else
# define DESCRIPTOR int
# if __GNUC__ >= 4 && (defined(COMM_EXPORTS) || defined(visitcommon_EXPORTS))
# define COMM_API __attribute__ ((visibility("default")))
# if __GNUC__ >= 4
# if (defined(COMM_EXPORTS) || defined(visitcommon_EXPORTS))
# define COMM_API __attribute__ ((visibility("default")))
# else
# define COMM_API /* hidden by default */
# endif
# define COMM_API2 __attribute__ ((visibility("default"))) /* Always visible */
# else
# define COMM_API /* hidden by default */
# define COMM_API /* hidden by default */
# define COMM_API2 /* hidden by default */
# endif
#endif
......
......@@ -62,7 +62,7 @@
//
// ****************************************************************************
class EXPR_API InvalidExpressionException : public VisItException
class EXPR_API2 InvalidExpressionException : public VisItException
{
public:
InvalidExpressionException(std::string);
......
......@@ -62,7 +62,7 @@
//
// ****************************************************************************
class EXPR_API RecursiveExpressionException : public VisItException
class EXPR_API2 RecursiveExpressionException : public VisItException
{
public:
RecursiveExpressionException(std::string);
......
......@@ -41,9 +41,11 @@
#if defined(_WIN32)
# if defined(EXPR_EXPORTS) || defined(visitcommon_EXPORTS)
# define EXPR_API __declspec(dllexport)
# define EXPR_API __declspec(dllexport)
# define EXPR_API2 __declspec(dllexport)
# else
# define EXPR_API __declspec(dllimport)
# define EXPR_API __declspec(dllimport)
# define EXPR_API2 __declspec(dllimport)
# endif
# ifdef _MSC_VER
// Turn off warning about lack of DLL interface
......@@ -54,10 +56,16 @@
# pragma warning(disable:4786)
# endif
#else
# if __GNUC__ >= 4 && (defined(EXPR_EXPORTS) || defined(visitcommon_EXPORTS))
# define EXPR_API __attribute__ ((visibility("default")))
# if __GNUC__ >= 4
# if (defined(EXPR_EXPORTS) || defined(visitcommon_EXPORTS))
# define EXPR_API __attribute__ ((visibility("default")))
# else
# define EXPR_API /* hidden by default */
# endif
# define EXPR_API2 __attribute__ ((visibility("default"))) /* Always visible */
# else
# define EXPR_API /* hidden by default */
# define EXPR_API /* hidden by default */
# define EXPR_API2 /* hidden by default */
# endif
#endif
......
......@@ -109,7 +109,7 @@
//
// ****************************************************************************
class MISC_API VisItException
class MISC_API2 VisItException
{
public:
VisItException();
......
......@@ -41,9 +41,11 @@
#if defined(_WIN32)
# if defined(MISC_EXPORTS) || defined(visitcommon_EXPORTS)
# define MISC_API __declspec(dllexport)
# define MISC_API __declspec(dllexport)
# define MISC_API2 __declspec(dllexport)
# else
# define MISC_API __declspec(dllimport)
# define MISC_API __declspec(dllimport)
# define MISC_API2 __declspec(dllimport)
# endif
# if defined(_MSC_VER)
// Turn off warning about lack of DLL interface
......@@ -54,10 +56,16 @@
# pragma warning(disable:4786)
# endif
#else
# if __GNUC__ >= 4 && (defined(MISC_EXPORTS) || defined(visitcommon_EXPORTS))
# define MISC_API __attribute__ ((visibility("default")))
# if __GNUC__ >= 4
# if (defined(MISC_EXPORTS) || defined(visitcommon_EXPORTS))
# define MISC_API __attribute__ ((visibility("default")))
# else
# define MISC_API /* hidden by default */
# endif
# define MISC_API2 __attribute__ ((visibility("default"))) /* Always visible */
# else
# define MISC_API /* hidden by default */
# define MISC_API /* hidden by default */
# define MISC_API2 /* hidden by default */
# endif
#endif
......
......@@ -59,7 +59,7 @@
//
// ****************************************************************************
class PLUGIN_API InvalidDirectoryException : public VisItException
class PLUGIN_API2 InvalidDirectoryException : public VisItException
{
public:
InvalidDirectoryException(const char *);
......
......@@ -59,7 +59,7 @@
//
// ****************************************************************************
class PLUGIN_API InvalidPluginException : public VisItException
class PLUGIN_API2 InvalidPluginException : public VisItException
{
public:
InvalidPluginException(const char *message,
......
......@@ -41,9 +41,11 @@
#if defined(_WIN32)
# if defined(PLUGIN_EXPORTS) || defined(visitcommon_EXPORTS)
# define PLUGIN_API __declspec(dllexport)
# define PLUGIN_API __declspec(dllexport)
# define PLUGIN_API2 __declspec(dllexport)
# else
# define PLUGIN_API __declspec(dllimport)
# define PLUGIN_API __declspec(dllimport)
# define PLUGIN_API2 __declspec(dllimport)
# endif
# if defined(_MSC_VER)
// Turn off warning about inheritance by dominance.
......@@ -56,10 +58,16 @@
# pragma warning(disable:4786)
# endif
#else
# if __GNUC__ >= 4 && (defined(PLUGIN_EXPORTS) || defined(visitcommon_EXPORTS))
# define PLUGIN_API __attribute__ ((visibility("default")))
# if __GNUC__ >= 4
# if (defined(PLUGIN_EXPORTS) || defined(visitcommon_EXPORTS))
# define PLUGIN_API __attribute__ ((visibility("default")))
# else
# define PLUGIN_API /* hidden by default */
# endif
# define PLUGIN_API2 __attribute__ ((visibility("default"))) /* Always visible */
# else
# define PLUGIN_API /* hidden by default */
# define PLUGIN_API /* hidden by default */
# define PLUGIN_API2 /* hidden by default */
# endif
#endif
......
......@@ -57,7 +57,7 @@
//
// *******************************************************************
class MDSERVER_RPC_API ChangeDirectoryException : public VisItException
class MDSERVER_RPC_API2 ChangeDirectoryException : public VisItException
{
public:
ChangeDirectoryException(const std::string &dir);
......
......@@ -58,7 +58,7 @@
//
// *******************************************************************
class MDSERVER_RPC_API GetFileListException : public VisItException
class MDSERVER_RPC_API2 GetFileListException : public VisItException
{
public:
GetFileListException();
......
......@@ -60,7 +60,7 @@
//
// *******************************************************************
class MDSERVER_RPC_API GetMetaDataException : public VisItException
class MDSERVER_RPC_API2 GetMetaDataException : public VisItException
{
public:
GetMetaDataException();
......
......@@ -41,9 +41,11 @@
#if defined(_WIN32)
#if defined(MDSERVER_RPC_EXPORTS) || defined(mdserverrpc_EXPORTS)
#define MDSERVER_RPC_API __declspec(dllexport)
#define MDSERVER_RPC_API __declspec(dllexport)
#define MDSERVER_RPC_API2 __declspec(dllexport)
#else
#define MDSERVER_RPC_API __declspec(dllimport)
#define MDSERVER_RPC_API __declspec(dllimport)
#define MDSERVER_RPC_API2 __declspec(dllimport)
#endif
#if defined(_MSC_VER)
// Turn off warning about lack of DLL interface
......@@ -54,10 +56,16 @@
#pragma warning(disable:4786)
#endif
#else
# if __GNUC__ >= 4 && (defined(MDSERVER_RPC_EXPORTS) || defined(mdserverrpc_EXPORTS))
# define MDSERVER_RPC_API __attribute__ ((visibility("default")))
# if __GNUC__ >= 4
# if (defined(MDSERVER_RPC_EXPORTS) || defined(mdserverrpc_EXPORTS))
# define MDSERVER_RPC_API __attribute__ ((visibility("default")))
# else
# define MDSERVER_RPC_API /* hidden by default */
# endif
# define MDSERVER_RPC_API2 __attribute__ ((visibility("default"))) /* Always visible */
# else
# define MDSERVER_RPC_API /* hidden by default */
# define MDSERVER_RPC_API /* hidden by default */
# define MDSERVER_RPC_API2 /* hidden by default */
# endif
#endif
......
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