Revision: 76750
http://sourceforge.net/p/brlcad/code/76750
Author: starseeker
Date: 2020-08-14 13:07:56 +0000 (Fri, 14 Aug 2020)
Log Message:
-----------
Cherrypick r76663 - distinguish between static and dynamic MSVC builds in
openNURBS.
Modified Paths:
--------------
brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_extensions.h
Property Changed:
----------------
brlcad/branches/RELEASE/
Index: brlcad/branches/RELEASE
===================================================================
--- brlcad/branches/RELEASE 2020-08-14 13:03:49 UTC (rev 76749)
+++ brlcad/branches/RELEASE 2020-08-14 13:07:56 UTC (rev 76750)
Property changes on: brlcad/branches/RELEASE
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76644,76655,76662,76729-76730
\ No newline at end of property
+/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76644,76655,76662-76663,76729-76730
\ No newline at end of property
Modified: brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_extensions.h
===================================================================
--- brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_extensions.h
2020-08-14 13:03:49 UTC (rev 76749)
+++ brlcad/branches/RELEASE/src/other/openNURBS/opennurbs_extensions.h
2020-08-14 13:07:56 UTC (rev 76750)
@@ -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
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
