Merge branch 'charm' of charmgit:charm into charm
authorAbhinav S Bhatele <bhatele@illinois.edu>
Thu, 17 Feb 2011 22:45:46 +0000 (16:45 -0600)
committerAbhinav S Bhatele <bhatele@illinois.edu>
Thu, 17 Feb 2011 22:45:46 +0000 (16:45 -0600)
src/ck-ldb/WSLB.h
src/scripts/Makefile

index 19ac5a2b889a8291ef161d3681c7f11401aaea63..62a9cd4a1d6bbb70ec29b3a2422b48108e7fc4b0 100644 (file)
@@ -9,8 +9,8 @@
 
 /*@{*/
 
-#ifndef NEIGHBORLB_H
-#define NEIGHBORLB_H
+#ifndef _WSLB_H_
+#define _WSLB_H_
 
 #include "BaseLB.h"
 #include "WSLB.decl.h"
@@ -136,7 +136,7 @@ public:
 }; 
 
 
-#endif /* NEIGHBORLB_H */
+#endif /* _WSLB_H_ */
 
 
 /*@}*/
index c4eefd9a5f8d60f7dbd2621c0a1f5a6cc03b7f4b..f18cb5e8da2f7028ed7ca4dc91089a347f023246 100644 (file)
@@ -667,7 +667,7 @@ LIBCK_CORE=trace-common.o tracec.o tracef.o init.o register.o qd.o ck.o main.o
            tempo.o waitqd.o LBDatabase.o lbdb.o lbdbf.o charisma.o ckobjQ.o  \
           LBAgent.o LBProfit.o ckcheckpoint.o ckmemcheckpoint.o ckevacuation.o ckmessagelogging.o\
            LBDBManager.o LBComm.o LBObj.o LBMachineUtil.o CentralPredictor.o \
-          BaseLB.o CentralLB.o HybridBaseLB.o NborBaseLB.o WSLB.o \
+          BaseLB.o CentralLB.o HybridBaseLB.o NborBaseLB.o \
            ckgraph.o graph.o LButil.o Refiner.o RefinerApprox.o  \
            RefinerComm.o bitvecset.o ckset.o ckheap.o CommLBHeap.o \
           NullLB.o LBSimulation.o $(COMLIB_CORE_OBJS) modifyScheduler.o \