Revision: 76795
http://sourceforge.net/p/brlcad/code/76795
Author: starseeker
Date: 2020-08-16 13:56:30 +0000 (Sun, 16 Aug 2020)
Log Message:
-----------
Merge from trunk: r76790 through r76794
Modified Paths:
--------------
brlcad/branches/RELEASE/include/bu/magic.h
brlcad/branches/RELEASE/regress/solids/CMakeLists.txt
brlcad/branches/RELEASE/src/libdm/include/calltable.h
brlcad/branches/RELEASE/src/libged/include/plugin.h
Property Changed:
----------------
brlcad/branches/RELEASE/
brlcad/branches/RELEASE/include/
Index: brlcad/branches/RELEASE
===================================================================
--- brlcad/branches/RELEASE 2020-08-15 16:38:22 UTC (rev 76794)
+++ brlcad/branches/RELEASE 2020-08-16 13:56:30 UTC (rev 76795)
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-76790
\ 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-76794
\ No newline at end of property
Index: brlcad/branches/RELEASE/include
===================================================================
--- brlcad/branches/RELEASE/include 2020-08-15 16:38:22 UTC (rev 76794)
+++ brlcad/branches/RELEASE/include 2020-08-16 13:56:30 UTC (rev 76795)
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-76790
\ 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-76794
\ No newline at end of property
Modified: brlcad/branches/RELEASE/include/bu/magic.h
===================================================================
--- brlcad/branches/RELEASE/include/bu/magic.h 2020-08-15 16:38:22 UTC (rev
76794)
+++ brlcad/branches/RELEASE/include/bu/magic.h 2020-08-16 13:56:30 UTC (rev
76795)
@@ -241,8 +241,7 @@
# define BU_CKMAG(_ptr, _magic, _str) (void)(_ptr)
#else
# define BU_CKMAG(_ptr, _magic, _str) do { \
- if (UNLIKELY(( (!(_ptr)) /* non-NULL pointer */ \
- || ((uintptr_t)(_ptr) == 0) /* non-zero pointer */ \
+ if (UNLIKELY(( ((uintptr_t)(_ptr) == 0) /* non-zero pointer */ \
|| ((uintptr_t)(_ptr) & (sizeof((uintptr_t)(_ptr))-1)) /*
aligned ptr */ \
|| (*((const uint32_t *)(_ptr)) != (uint32_t)(_magic)) /*
matches value */ \
))) { \
Modified: brlcad/branches/RELEASE/regress/solids/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/regress/solids/CMakeLists.txt 2020-08-15
16:38:22 UTC (rev 76794)
+++ brlcad/branches/RELEASE/regress/solids/CMakeLists.txt 2020-08-16
13:56:30 UTC (rev 76795)
@@ -2,7 +2,7 @@
if (SH_EXEC AND TARGET mged AND TARGET asc2g)
add_test(NAME regress-solids COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/solids.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-solids "rt;asc2g;pixdiff;pix-png;png-pix"
TEST_DEFINED)
+ BRLCAD_REGRESSION_TEST(regress-solids
"rt;asc2g;asc2pix;pixdiff;pix-png;png-pix" TEST_DEFINED)
endif (SH_EXEC AND TARGET mged AND TARGET asc2g)
Modified: brlcad/branches/RELEASE/src/libdm/include/calltable.h
===================================================================
--- brlcad/branches/RELEASE/src/libdm/include/calltable.h 2020-08-15
16:38:22 UTC (rev 76794)
+++ brlcad/branches/RELEASE/src/libdm/include/calltable.h 2020-08-16
13:56:30 UTC (rev 76795)
@@ -43,7 +43,7 @@
__BEGIN_DECLS
-#define DM_API ((BRLCAD_VERSION_MAJOR*10000) + (BRLCAD_VERSION_MINOR*100) +
BRLCAD_VERSION_PATCH)
+#define DM_API (1*1000000 + (BRLCAD_VERSION_MAJOR*10000) +
(BRLCAD_VERSION_MINOR*100) + BRLCAD_VERSION_PATCH)
struct dm_vars {
void *pub_vars;
Modified: brlcad/branches/RELEASE/src/libged/include/plugin.h
===================================================================
--- brlcad/branches/RELEASE/src/libged/include/plugin.h 2020-08-15 16:38:22 UTC
(rev 76794)
+++ brlcad/branches/RELEASE/src/libged/include/plugin.h 2020-08-16 13:56:30 UTC
(rev 76795)
@@ -26,7 +26,7 @@
#include "../ged_private.h"
#include "brlcad_version.h"
-#define GED_API ((BRLCAD_VERSION_MAJOR*10000) + (BRLCAD_VERSION_MINOR*100) +
BRLCAD_VERSION_PATCH)
+#define GED_API (2*1000000 + (BRLCAD_VERSION_MAJOR*10000) +
(BRLCAD_VERSION_MINOR*100) + BRLCAD_VERSION_PATCH)
extern void *ged_cmds;
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
