Revision: 75934
http://sourceforge.net/p/brlcad/code/75934
Author: starseeker
Date: 2020-05-26 02:45:23 +0000 (Tue, 26 May 2020)
Log Message:
-----------
Merged changes from trunk through r75933
Modified Paths:
--------------
brlcad/branches/bioh/src/other/openNURBS/opennurbs_extensions.cpp
brlcad/branches/bioh/src/other/openNURBS/opennurbs_extensions.h
Property Changed:
----------------
brlcad/branches/bioh/
brlcad/branches/bioh/src/other/
Index: brlcad/branches/bioh
===================================================================
--- brlcad/branches/bioh 2020-05-26 01:40:23 UTC (rev 75933)
+++ brlcad/branches/bioh 2020-05-26 02:45:23 UTC (rev 75934)
Property changes on: brlcad/branches/bioh
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:75720-75931
\ No newline at end of property
+/brlcad/trunk:75720-75933
\ No newline at end of property
Index: brlcad/branches/bioh/src/other
===================================================================
--- brlcad/branches/bioh/src/other 2020-05-26 01:40:23 UTC (rev 75933)
+++ brlcad/branches/bioh/src/other 2020-05-26 02:45:23 UTC (rev 75934)
Property changes on: brlcad/branches/bioh/src/other
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/osg/src/other:62110-62113
/brlcad/branches/prep-cache/src/other:68236-68933
/brlcad/branches/tcltk86/src/other:68300-75257
-/brlcad/trunk/src/other:75720-75834,75891-75931
\ No newline at end of property
+/brlcad/trunk/src/other:75720-75834,75891-75933
\ No newline at end of property
Modified: brlcad/branches/bioh/src/other/openNURBS/opennurbs_extensions.cpp
===================================================================
--- brlcad/branches/bioh/src/other/openNURBS/opennurbs_extensions.cpp
2020-05-26 01:40:23 UTC (rev 75933)
+++ brlcad/branches/bioh/src/other/openNURBS/opennurbs_extensions.cpp
2020-05-26 02:45:23 UTC (rev 75934)
@@ -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/branches/bioh/src/other/openNURBS/opennurbs_extensions.h
===================================================================
--- brlcad/branches/bioh/src/other/openNURBS/opennurbs_extensions.h
2020-05-26 01:40:23 UTC (rev 75933)
+++ brlcad/branches/bioh/src/other/openNURBS/opennurbs_extensions.h
2020-05-26 02:45:23 UTC (rev 75934)
@@ -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
