Make iris work with compile script.
authorBrian Demsky <bdemsky@uci.edu>
Sat, 22 Jun 2019 02:36:19 +0000 (19:36 -0700)
committerBrian Demsky <bdemsky@uci.edu>
Sat, 22 Jun 2019 02:36:19 +0000 (19:36 -0700)
iris/Makefile
iris/tests/test_lfringbuffer.cpp

index a2ee497d87de3460fed96b0e78bf387bfc46b40c..c8b8d2bca5b1145bce9372c76fa9337350a5e8cf 100644 (file)
@@ -10,7 +10,7 @@ IRIS_TEST2_OBJS = $(IRIS_OBJS) test2.o
 PROGRAM = libiris.so
 #PROGRAM = main
 #compiler
 PROGRAM = libiris.so
 #PROGRAM = main
 #compiler
-CC = g++
+CC = ../clang++
 
 CACHELINE_SIZE =
 OS := $(shell uname)
 
 CACHELINE_SIZE =
 OS := $(shell uname)
index 16e7f37704aa082159b82776e01ec05e9a946206..5f793545b93dd7746c6829bd98cdd85f4bbd6075 100644 (file)
@@ -7,8 +7,8 @@
 #include <sslfqueue.h>
 #include <define.h>
 
 #include <sslfqueue.h>
 #include <define.h>
 
-#include <iris/level_logger.h>
-#include <iris/file_writer.h>
+#include <level_logger.h>
+#include <file_writer.h>
 
 iris::file_writer writer("./log.txt");
 // this creates a logging thread
 
 iris::file_writer writer("./log.txt");
 // this creates a logging thread