From: Brian Demsky <bdemsky@uci.edu>
Date: Thu, 15 Nov 2012 02:15:04 +0000 (-0800)
Subject: merge
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=cdsspec-compiler.git;a=commitdiff_plain;h=45206350b4022732229f8a48a3c7b08885e874a7

merge
Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker

Conflicts:
	config.h
	model.cc
---

45206350b4022732229f8a48a3c7b08885e874a7
diff --cc config.h
index 9488542,e064e39..aacbb81
--- a/config.h
+++ b/config.h
@@@ -48,6 -48,7 +48,10 @@@
  /* Size of stack to allocate for a thread. */
  #define STACK_SIZE (1024 * 1024)
  
++/** How many shadow tables of memory to preallocate for data race detector. */
 +#define SHADOWBASETABLES 4
 +
+ /** Enable debugging assertions (via ASSERT()) */
+ #define CONFIG_ASSERT
+ 
  #endif