Revision: 76791
http://sourceforge.net/p/brlcad/code/76791
Author: starseeker
Date: 2020-08-15 14:47:29 +0000 (Sat, 15 Aug 2020)
Log Message:
-----------
Merge from trunk: r76788 through r76790
Modified Paths:
--------------
brlcad/branches/RELEASE/include/ged/defines.h
brlcad/branches/RELEASE/src/libged/ged_init.cpp
Property Changed:
----------------
brlcad/branches/RELEASE/
brlcad/branches/RELEASE/include/
Index: brlcad/branches/RELEASE
===================================================================
--- brlcad/branches/RELEASE 2020-08-15 14:35:14 UTC (rev 76790)
+++ brlcad/branches/RELEASE 2020-08-15 14:47:29 UTC (rev 76791)
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-76768,76771-76788
\ 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-76768,76771-76790
\ No newline at end of property
Index: brlcad/branches/RELEASE/include
===================================================================
--- brlcad/branches/RELEASE/include 2020-08-15 14:35:14 UTC (rev 76790)
+++ brlcad/branches/RELEASE/include 2020-08-15 14:47:29 UTC (rev 76791)
Property changes on: brlcad/branches/RELEASE/include
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl/include:65867-66137
/brlcad/branches/osg/include:62110-62113
/brlcad/branches/prep-cache/include:68236-68933
-/brlcad/trunk/include: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-76726,76729-76730,76748-76764,76771-76788
\ No newline at end of property
+/brlcad/trunk/include: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-76726,76729-76730,76748-76764,76771-76790
\ No newline at end of property
Modified: brlcad/branches/RELEASE/include/ged/defines.h
===================================================================
--- brlcad/branches/RELEASE/include/ged/defines.h 2020-08-15 14:35:14 UTC
(rev 76790)
+++ brlcad/branches/RELEASE/include/ged/defines.h 2020-08-15 14:47:29 UTC
(rev 76791)
@@ -328,7 +328,7 @@
};
struct ged_plugin {
- uint32_t api_version;
+ uint32_t api_version; /* must be first in struct */
const struct ged_cmd ** const cmds;
int cmd_cnt;
};
Modified: brlcad/branches/RELEASE/src/libged/ged_init.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libged/ged_init.cpp 2020-08-15 14:35:14 UTC
(rev 76790)
+++ brlcad/branches/RELEASE/src/libged/ged_init.cpp 2020-08-15 14:47:29 UTC
(rev 76791)
@@ -169,7 +169,7 @@
continue;
}
- if (((uintptr_t)(plugin) & (sizeof((uintptr_t)(plugin))-1)) ||
*((const uint32_t *)(plugin)) != (uint32_t) (GED_API)) {
+ if (*((const uint32_t *)(plugin)) != (uint32_t) (GED_API)) {
bu_vls_printf(ged_init_msg_str, "Plugin version %d of '%s'
differs from %d (skipping)\n", *((const uint32_t *)(plugin)), pfile, GED_API);
bu_dlclose(dl_handle);
continue;
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
