Revision: 75933
http://sourceforge.net/p/brlcad/code/75933
Author: starseeker
Date: 2020-05-26 01:40:23 +0000 (Tue, 26 May 2020)
Log Message:
-----------
ON_DLL_EXPORTS/ON_DLL_IMPORTS is no longer specific enough for an MSVC only
override.
Modified Paths:
--------------
brlcad/trunk/src/other/openNURBS/opennurbs_extensions.cpp
brlcad/trunk/src/other/openNURBS/opennurbs_extensions.h
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_extensions.cpp
===================================================================
--- brlcad/trunk/src/other/openNURBS/opennurbs_extensions.cpp 2020-05-26
01:17:10 UTC (rev 75932)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_extensions.cpp 2020-05-26
01:40:23 UTC (rev 75933)
@@ -29,7 +29,8 @@
#endif
-#if defined(ON_DLL_EXPORTS)
+#if defined(ON_COMPILER_MSC)
+# if defined(ON_DLL_EXPORTS)
////////////////////////////////////////////////////////////////////////////////
//
@@ -203,6 +204,7 @@
return;
}
+# endif
#endif
//
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_extensions.h
===================================================================
--- brlcad/trunk/src/other/openNURBS/opennurbs_extensions.h 2020-05-26
01:17:10 UTC (rev 75932)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_extensions.h 2020-05-26
01:40:23 UTC (rev 75933)
@@ -25,7 +25,7 @@
class ON_CLASS ONX_Model_UserData
{
public:
-#if defined(ON_DLL_EXPORTS) || defined(ON_DLL_IMPORTS)
+#if defined(ON_COMPILER_MSC)
// See comments at the top of opennurbs_extensions.cpp for details.
// new/delete
@@ -67,7 +67,7 @@
class ON_CLASS ONX_Model_Object
{
public:
-#if defined(ON_DLL_EXPORTS) || defined(ON_DLL_IMPORTS)
+#if defined(ON_COMPILER_MSC)
// See comments at the top of opennurbs_extensions.cpp for details.
// new/delete
@@ -109,7 +109,7 @@
class ON_CLASS ONX_Model_RenderLight
{
public:
-#if defined(ON_DLL_EXPORTS) || defined(ON_DLL_IMPORTS)
+#if defined(ON_COMPILER_MSC)
// See comments at the top of opennurbs_extensions.cpp for details.
// new/delete
@@ -175,7 +175,7 @@
class ON_CLASS ONX_Model
{
public:
-#if defined(ON_DLL_EXPORTS) || defined(ON_DLL_IMPORTS)
+#if defined(ON_COMPILER_MSC)
// See comments at the top of opennurbs_extensions.cpp for details.
// new/delete
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
