Merge pull request #327 from terrelln/dev

Pzstd should now compile with gcc

.travis.yml

@@ -9,6 +9,16 @@ matrix:
       env: PLATFORM="Ubuntu 12.04 container" CMD="make test && make clean && make travis-install"
     - os: linux
       sudo: false
+      language: cpp
+      install:
+        - export CXX="g++-4.8" CC="gcc-4.8"
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - gcc-4.8
+            - g++-4.8
       env: PLATFORM="Ubuntu 12.04 container" CMD="make -C tests test-zstd_nolegacy && make clean && make zlibwrapper && make clean && make cmaketest && make -C contrib/pzstd googletest && make -C contrib/pzstd test && make -C contrib/pzstd clean"
     - os: linux
       sudo: false

contrib/pzstd/Makefile

@@ -11,12 +11,10 @@ ZSTDDIR = ../../lib
 PROGDIR = ../../programs
 
 CPPFLAGS = -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder -I$(PROGDIR) -I.
-CFLAGS  ?= -O3
+CXXFLAGS  ?= -O3
-CFLAGS  += -Wall -Wextra -Wcast-qual -Wcast-align -Wstrict-aliasing=1 \
+CXXFLAGS  += -std=c++11
-           -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef \
+CXXFLAGS  += $(MOREFLAGS)
-		 			-std=c++11
+FLAGS    = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
-CFLAGS  += $(MOREFLAGS)
-FLAGS    = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
 
 
 ZSTDCOMMON_FILES := $(ZSTDDIR)/common/*.c
@@ -56,7 +54,7 @@ Options.o: Options.h Options.cpp
 main.o: main.cpp *.h utils/*.h
 	$(CXX) $(FLAGS) -c main.cpp -o $@
 
-pzstd: libzstd.a Pzstd.o SkippableFrame.o Options.o main.o
+pzstd: Pzstd.o SkippableFrame.o Options.o main.o libzstd.a 
 	$(CXX) $(FLAGS) $^ -o $@$(EXT)
 
 googletest:

contrib/pzstd/Options.cpp

@@ -9,6 +9,7 @@
 #include "Options.h"
 
 #include <cstdio>
+#include <cstring>
 
 namespace pzstd {
 

contrib/pzstd/test/Makefile

@@ -22,18 +22,18 @@ ZSTDDIR = ../../../lib
 GTEST_INC ?= -isystem $(PZSTDDIR)/googletest/googletest/include
 GTEST_LIB ?= -L $(PZSTDDIR)/googletest/build/googlemock/gtest
 
-CPPFLAGS = -I$(PZSTDDIR) $(GTEST_INC) $(GTEST_LIB) -I$(ZSTDDIR)/common -I$(PROGDIR)
+CPPFLAGS = -I$(PZSTDDIR) $(GTEST_INC) $(GTEST_LIB) -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(PROGDIR) -I.
 
-CFLAGS  ?= -O3
+CXXFLAGS  ?= -O3
-CFLAGS  += -std=c++11
+CXXFLAGS  += -std=c++11
-CFLAGS  += $(MOREFLAGS)
+CXXFLAGS  += $(MOREFLAGS)
-FLAGS    = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+FLAGS    = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
 
 datagen.o: $(PROGDIR)/datagen.*
 	$(CXX) $(FLAGS) $(PROGDIR)/datagen.c -c -o $@
 
 %: %.cpp *.h datagen.o
-	$(CXX) $(FLAGS) -lgtest -lgtest_main $@.cpp datagen.o $(PZSTDDIR)/libzstd.a $(PZSTDDIR)/Pzstd.o $(PZSTDDIR)/SkippableFrame.o $(PZSTDDIR)/Options.o -o $@$(EXT)
+	$(CXX) $(FLAGS) $@.cpp datagen.o $(PZSTDDIR)/Pzstd.o $(PZSTDDIR)/SkippableFrame.o $(PZSTDDIR)/Options.o $(PZSTDDIR)/libzstd.a -o $@$(EXT) -lgtest -lgtest_main -lpthread
 
 .PHONY: test clean
 

contrib/pzstd/utils/Range.h

@@ -16,6 +16,7 @@
 #include "utils/Likely.h"
 
 #include <cstddef>
+#include <cstring>
 #include <stdexcept>
 #include <string>
 #include <type_traits>

contrib/pzstd/utils/test/Makefile

@@ -21,13 +21,13 @@ GTEST_INC ?= -isystem $(PZSTDDIR)/googletest/googletest/include
 GTEST_LIB ?= -L $(PZSTDDIR)/googletest/build/googlemock/gtest
 
 CPPFLAGS = -I$(PZSTDDIR) $(GTEST_INC) $(GTEST_LIB)
-CFLAGS  ?= -O3
+CXXFLAGS  ?= -O3
-CFLAGS  += -std=c++11
+CXXFLAGS  += -std=c++11
 CFLAGS  += $(MOREFLAGS)
-FLAGS    = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+FLAGS    = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
 
 %: %.cpp
-	$(CXX) $(FLAGS) -lgtest -lgtest_main $^ -o $@$(EXT)
+	$(CXX) $(FLAGS) $^ -o $@$(EXT) -lgtest -lgtest_main -lpthread
 
 .PHONY: test clean