From 43a683bc99d49add3a84f79f62fdd2b54e292e0c Mon Sep 17 00:00:00 2001
From: neverchanje <wutao1@xiaomi.com>
Date: Sat, 29 Sep 2018 22:07:57 +0800
Subject: [PATCH] fix build-thirdparty and build failure on gcc-5.4

---
 include/dsn/tool-api/http_server.h | 2 ++
 thirdparty/build-thirdparty.sh     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/dsn/tool-api/http_server.h b/include/dsn/tool-api/http_server.h
index fa0ca781b5..acf5613c04 100644
--- a/include/dsn/tool-api/http_server.h
+++ b/include/dsn/tool-api/http_server.h
@@ -44,6 +44,8 @@ class http_service
 public:
     typedef std::function<void(const http_request &req, http_response &resp)> http_callback;
 
+    virtual ~http_service() = default;
+
     virtual std::string path() const = 0;
 
     void register_handler(std::string path, http_callback cb)
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index eb65b7411c..f3340a5d09 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -248,7 +248,7 @@ fi
 
 # build s2geometry
 if [ ! -d $TP_OUTPUT/include/s2 ]; then
-    cd $TP_SRC/s2geometry-master
+    cd $TP_SRC/s2geometry-0239455c1e260d6d2c843649385b4fb9f5b28dba
     mkdir -p build && cd build
     cmake .. -DGTEST_INCLUDE=$TP_OUTPUT/include -DCMAKE_INSTALL_PREFIX=$TP_OUTPUT
     make -j8 && make install