Revision: 76663
http://sourceforge.net/p/brlcad/code/76663
Author: d_rossberg
Date: 2020-08-06 08:23:51 +0000 (Thu, 06 Aug 2020)
Log Message:
-----------
we still need to distinguish between dynamic and static library MSVC builds,
with ON_DLL_EXPORTS/ON_DLL_IMPORTS set or unset
Modified Paths:
--------------
brlcad/trunk/src/other/openNURBS/opennurbs_extensions.h
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_extensions.h
===================================================================
--- brlcad/trunk/src/other/openNURBS/opennurbs_extensions.h 2020-08-06
08:17:37 UTC (rev 76662)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_extensions.h 2020-08-06
08:23:51 UTC (rev 76663)
@@ -26,6 +26,7 @@
{
public:
#if defined(ON_COMPILER_MSC)
+#if defined(ON_DLL_EXPORTS) || defined(ON_DLL_IMPORTS)
// See comments at the top of opennurbs_extensions.cpp for details.
// new/delete
@@ -40,6 +41,7 @@
void* operator new(size_t,void*);
void operator delete(void*,void*);
#endif
+#endif
ONX_Model_UserData();
~ONX_Model_UserData();
@@ -68,6 +70,7 @@
{
public:
#if defined(ON_COMPILER_MSC)
+#if defined(ON_DLL_EXPORTS) || defined(ON_DLL_IMPORTS)
// See comments at the top of opennurbs_extensions.cpp for details.
// new/delete
@@ -82,6 +85,7 @@
void* operator new(size_t,void*);
void operator delete(void*,void*);
#endif
+#endif
ONX_Model_Object();
~ONX_Model_Object();
@@ -110,6 +114,7 @@
{
public:
#if defined(ON_COMPILER_MSC)
+#if defined(ON_DLL_EXPORTS) || defined(ON_DLL_IMPORTS)
// See comments at the top of opennurbs_extensions.cpp for details.
// new/delete
@@ -124,6 +129,7 @@
void* operator new(size_t,void*);
void operator delete(void*,void*);
#endif
+#endif
ONX_Model_RenderLight();
~ONX_Model_RenderLight();
@@ -176,6 +182,7 @@
{
public:
#if defined(ON_COMPILER_MSC)
+#if defined(ON_DLL_EXPORTS) || defined(ON_DLL_IMPORTS)
// See comments at the top of opennurbs_extensions.cpp for details.
// new/delete
@@ -190,6 +197,7 @@
void* operator new(size_t,void*);
void operator delete(void*,void*);
#endif
+#endif
ONX_Model();
virtual ~ONX_Model();
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
