Revision: 72410
http://sourceforge.net/p/brlcad/code/72410
Author: brlcad
Date: 2019-02-11 21:07:19 +0000 (Mon, 11 Feb 2019)
Log Message:
-----------
revert 72398 due to globals, need to fix at same time
Modified Paths:
--------------
brlcad/trunk/TODO
brlcad/trunk/include/analyze.h
brlcad/trunk/include/ged/defines.h
brlcad/trunk/include/ged.h
Modified: brlcad/trunk/TODO
===================================================================
--- brlcad/trunk/TODO 2019-02-11 21:02:10 UTC (rev 72409)
+++ brlcad/trunk/TODO 2019-02-11 21:07:19 UTC (rev 72410)
@@ -23,7 +23,6 @@
* prep caching actions
- needs to double-check graceful fallback when cache has any issue
- debug means to set env vars
- - large db tests need to be enabled
THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS
Modified: brlcad/trunk/include/analyze.h
===================================================================
--- brlcad/trunk/include/analyze.h 2019-02-11 21:02:10 UTC (rev 72409)
+++ brlcad/trunk/include/analyze.h 2019-02-11 21:07:19 UTC (rev 72410)
@@ -31,6 +31,7 @@
#include "common.h"
#include "bu/opt.h"
#include "bu/vls.h"
+#include "ged/defines.h" /* For GED_SEM_LAST */
#include "raytrace.h"
__BEGIN_DECLS
@@ -50,7 +51,7 @@
/* Libanalyze return codes */
#define ANALYZE_OK 0x0000
#define ANALYZE_ERROR 0x0001 /**< something went wrong, function not completed
*/
-#define ANALYZE_SEM_WORKER RT_SEM_LAST
+#define ANALYZE_SEM_WORKER GED_SEM_LAST
#define ANALYZE_SEM_STATS ANALYZE_SEM_WORKER+1
#define ANALYZE_SEM_LIST ANALYZE_SEM_STATS+1
#define ANALYZE_SEM_LAST ANALYZE_SEM_LIST+1
Modified: brlcad/trunk/include/ged/defines.h
===================================================================
--- brlcad/trunk/include/ged/defines.h 2019-02-11 21:02:10 UTC (rev 72409)
+++ brlcad/trunk/include/ged/defines.h 2019-02-11 21:07:19 UTC (rev 72410)
@@ -87,7 +87,7 @@
* Definition of global parallel-processing semaphores.
*
*/
-#define GED_SEM_WORKER ANALYZE_SEM_LAST
+#define GED_SEM_WORKER RT_SEM_LAST
#define GED_SEM_STATS GED_SEM_WORKER+1
#define GED_SEM_LIST GED_SEM_STATS+1
#define GED_SEM_LAST GED_SEM_LIST+1
Modified: brlcad/trunk/include/ged.h
===================================================================
--- brlcad/trunk/include/ged.h 2019-02-11 21:02:10 UTC (rev 72409)
+++ brlcad/trunk/include/ged.h 2019-02-11 21:07:19 UTC (rev 72410)
@@ -36,7 +36,6 @@
#include "dm/bview.h"
#include "raytrace.h"
#include "rt/solid.h"
-#include "analyze.h"
#include "ged/defines.h"
#include "ged/database.h"
#include "ged/commands.h"
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
