Revision: 76447
http://sourceforge.net/p/brlcad/code/76447
Author: starseeker
Date: 2020-07-23 16:11:32 +0000 (Thu, 23 Jul 2020)
Log Message:
-----------
Simplify - MSVC doesn't like the GED_EXPORT here...
Modified Paths:
--------------
brlcad/branches/gedplugins/src/libged/brep/csg.cpp
Modified: brlcad/branches/gedplugins/src/libged/brep/csg.cpp
===================================================================
--- brlcad/branches/gedplugins/src/libged/brep/csg.cpp 2020-07-23 15:59:49 UTC
(rev 76446)
+++ brlcad/branches/gedplugins/src/libged/brep/csg.cpp 2020-07-23 16:11:32 UTC
(rev 76447)
@@ -748,27 +748,25 @@
return 0;
}
-extern "C" {
- GED_EXPORT int
- _ged_brep_to_csg(struct ged *gedp, const char *dp_name, int verify)
- {
- struct bu_attribute_value_set ito = BU_AVS_INIT_ZERO; /* islands to
objects */
- int ret = 0;
- struct bu_vls log = BU_VLS_INIT_ZERO;
- struct rt_wdb *wdbp = gedp->ged_wdbp;
- struct directory *dp = db_lookup(wdbp->dbip, dp_name, LOOKUP_QUIET);
- if (dp == RT_DIR_NULL) return GED_ERROR;
+extern "C"
+int _ged_brep_to_csg(struct ged *gedp, const char *dp_name, int verify)
+{
+ struct bu_attribute_value_set ito = BU_AVS_INIT_ZERO; /* islands to
objects */
+ int ret = 0;
+ struct bu_vls log = BU_VLS_INIT_ZERO;
+ struct rt_wdb *wdbp = gedp->ged_wdbp;
+ struct directory *dp = db_lookup(wdbp->dbip, dp_name, LOOKUP_QUIET);
+ if (dp == RT_DIR_NULL) return GED_ERROR;
- if (dp->d_flags & RT_DIR_COMB) {
- ret = comb_to_csg(gedp, &log, &ito, dp, verify) ? GED_ERROR :
GED_OK;
- } else {
- ret = _obj_brep_to_csg(gedp, &log, &ito, dp, verify, NULL) ?
GED_ERROR : GED_OK;
- }
+ if (dp->d_flags & RT_DIR_COMB) {
+ ret = comb_to_csg(gedp, &log, &ito, dp, verify) ? GED_ERROR : GED_OK;
+ } else {
+ ret = _obj_brep_to_csg(gedp, &log, &ito, dp, verify, NULL) ? GED_ERROR
: GED_OK;
+ }
- bu_vls_sprintf(gedp->ged_result_str, "%s", bu_vls_addr(&log));
- bu_vls_free(&log);
- return ret;
- }
+ bu_vls_sprintf(gedp->ged_result_str, "%s", bu_vls_addr(&log));
+ bu_vls_free(&log);
+ return ret;
}
// Local Variables:
// tab-width: 8
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
