From b12413eddb78cb4bea0ebac071067b1c0c022fea Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Wed, 27 Apr 2016 12:22:47 -0700 Subject: [PATCH] Rename everything from .cc to .cpp to match other projects --- .travis.yml | 2 +- Makefile | 6 +++--- decode.cc => decode.cpp | 2 +- geometry.cc => geometry.cpp | 2 +- geometry.hh => geometry.hpp | 0 mvt.cc => mvt.cpp | 2 +- mvt.hh => mvt.hpp | 0 tile-join.cc => tile-join.cpp | 2 +- tile.cc => tile.cpp | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) rename decode.cc => decode.cpp (99%) rename geometry.cc => geometry.cpp (99%) rename geometry.hh => geometry.hpp (100%) rename mvt.cc => mvt.cpp (99%) rename mvt.hh => mvt.hpp (100%) rename tile-join.cc => tile-join.cpp (99%) rename tile.cc => tile.cpp (99%) diff --git a/.travis.yml b/.travis.yml index f2488cc..344b838 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ matrix: install: - - BUILDTYPE=${BUILDTYPE} make + - BUILDTYPE=${BUILDTYPE} make -j script: - BUILDTYPE=${BUILDTYPE} make test diff --git a/Makefile b/Makefile index 4dfce70..0ed76d1 100644 --- a/Makefile +++ b/Makefile @@ -36,8 +36,8 @@ man/tippecanoe.1: README.md PG= -H = $(shell find . '(' -name '*.h' -o -name '*.hh' ')') -C = $(shell find . '(' -name '*.c' -o -name '*.cc' ')') +H = $(shell find . '(' -name '*.h' -o -name '*.hpp' ')') +C = $(shell find . '(' -name '*.c' -o -name '*.cpp' ')') INCLUDES = -I/usr/local/include -I. LIBS = -L/usr/local/lib @@ -61,7 +61,7 @@ libjsonpull.a: jsonpull.o %.o: %.c $(H) $(CC) $(PG) $(INCLUDES) $(FINAL_FLAGS) $(CFLAGS) -c $< -%.o: %.cc $(H) +%.o: %.cpp $(H) $(CXX) $(PG) $(INCLUDES) $(FINAL_FLAGS) $(CXXFLAGS) -c $< clean: diff --git a/decode.cc b/decode.cpp similarity index 99% rename from decode.cc rename to decode.cpp index c177ec1..4982bc4 100644 --- a/decode.cc +++ b/decode.cpp @@ -11,7 +11,7 @@ #include #include #include -#include "mvt.hh" +#include "mvt.hpp" #include "tile.h" extern "C" { diff --git a/geometry.cc b/geometry.cpp similarity index 99% rename from geometry.cc rename to geometry.cpp index 687b00c..2e12e07 100644 --- a/geometry.cc +++ b/geometry.cpp @@ -8,7 +8,7 @@ #include #include #include -#include "geometry.hh" +#include "geometry.hpp" #include "clipper/clipper.hpp" extern "C" { diff --git a/geometry.hh b/geometry.hpp similarity index 100% rename from geometry.hh rename to geometry.hpp diff --git a/mvt.cc b/mvt.cpp similarity index 99% rename from mvt.cc rename to mvt.cpp index 679d0e8..9223a02 100644 --- a/mvt.cc +++ b/mvt.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "mvt.hh" +#include "mvt.hpp" #include "protozero/varint.hpp" #include "protozero/pbf_reader.hpp" #include "protozero/pbf_writer.hpp" diff --git a/mvt.hh b/mvt.hpp similarity index 100% rename from mvt.hh rename to mvt.hpp diff --git a/tile-join.cc b/tile-join.cpp similarity index 99% rename from tile-join.cc rename to tile-join.cpp index 21d67c4..518ba4d 100644 --- a/tile-join.cc +++ b/tile-join.cpp @@ -9,7 +9,7 @@ #include #include #include -#include "mvt.hh" +#include "mvt.hpp" #include "tile.h" extern "C" { diff --git a/tile.cc b/tile.cpp similarity index 99% rename from tile.cc rename to tile.cpp index 9673909..f1c7d32 100644 --- a/tile.cc +++ b/tile.cpp @@ -19,8 +19,8 @@ #include #include #include -#include "mvt.hh" -#include "geometry.hh" +#include "mvt.hpp" +#include "geometry.hpp" extern "C" { #include "tile.h"