From: Brian Demsky <bdemsky@uci.edu>
Date: Sat, 22 Jun 2019 02:36:19 +0000 (-0700)
Subject: Make iris work with compile script.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cb2f5cd4b328521c2002bb8c977ac15bd25028d5;p=c11concurrency-benchmarks.git

Make iris work with compile script.
---

diff --git a/iris/Makefile b/iris/Makefile
index a2ee497..c8b8d2b 100644
--- a/iris/Makefile
+++ b/iris/Makefile
@@ -10,7 +10,7 @@ IRIS_TEST2_OBJS = $(IRIS_OBJS) test2.o
 PROGRAM = libiris.so
 #PROGRAM = main
 #compiler
-CC = g++
+CC = ../clang++
 
 CACHELINE_SIZE =
 OS := $(shell uname)
diff --git a/iris/tests/test_lfringbuffer.cpp b/iris/tests/test_lfringbuffer.cpp
index 16e7f37..5f79354 100644
--- a/iris/tests/test_lfringbuffer.cpp
+++ b/iris/tests/test_lfringbuffer.cpp
@@ -7,8 +7,8 @@
 #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