Skip to content
This repository has been archived by the owner on Jun 23, 2022. It is now read-only.

*: fix build-thirdparty and build failure on gcc-5.4 #168

Merged
merged 2 commits into from
Oct 8, 2018
Merged

*: fix build-thirdparty and build failure on gcc-5.4 #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43a683b
fix build-thirdparty and build failure on gcc-5.4
Sep 29, 2018
e850c37
Merge branch 'master' into dev1
Oct 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/dsn/tool-api/http_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/build-thirdparty.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down