fix build-thirdparty and build failure on gcc-5.4 (XiaoMi#168)

vagetablechicken · Oct 9, 2018 · 133d2a4 · 133d2a4
1 parent 1b260cf
commit 133d2a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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