From 643342ea935c21088ee9c0a835613c23a4016472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B8rn=20Rognes?= <torognes@ifi.uio.no>
Date: Wed, 8 Mar 2017 13:35:35 +0100
Subject: [PATCH] Remove another compiler warning

---
 src/Makefile  | 4 ++--
 src/algod1.cc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index bff2c134..5a5d90f2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -29,7 +29,7 @@ LIBS=-lpthread
 LINKFLAGS=$(COMMON)
 
 CXX=g++
-WARNINGS=-Wall -Wsign-compare -Wextra -Wpedantic -Wno-c++11-long-long
+WARNINGS=-Wall -Wsign-compare -Wextra -Wpedantic -Wno-long-long
 CXXFLAGS=$(COMMON) $(WARNINGS) -O3 -msse2 -mtune=core2 -Icityhash
 
 PROG=swarm
@@ -51,4 +51,4 @@ clean :
 	rm -rf swarm *.o *~ ../bin/ gmon.out cityhash/*.o ../man/*~ ../*~
 
 ssse3.o : ssse3.cc $(DEPS)
-	$(CXX) -mssse3 $(CXXFLAGS) -c -o $@ $<
+	$(CXX) $(CXXFLAGS) -mssse3 -c -o $@ $<
diff --git a/src/algod1.cc b/src/algod1.cc
index 0fa12279..cd1c8a7c 100644
--- a/src/algod1.cc
+++ b/src/algod1.cc
@@ -1231,7 +1231,7 @@ void algo_d1_run()
             }
 
           fprintf(logfile,
-                  "Bloom filter: bits=%ld, m=%ld, k=%ld, size=%.1lfMB\n",
+                  "Bloom filter: bits=%ld, m=%ld, k=%ld, size=%.1fMB\n",
                   bits, m, k, 1.0 * m / (8*1024*1024));
           
           bloomp = new BloomFilter(m, k);