Skip to content

Commit

Permalink
Merge pull request opencurve#1 from chuandew/upgrade
Browse files Browse the repository at this point in the history
[fix] Upgrade rocksdb and jsoncpp
  • Loading branch information
ketor authored Jul 15, 2024
2 parents d6643d7 + 5e1446e commit 9810e23
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 39 deletions.
2 changes: 2 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
build --verbose_failures

build --action_env=BAZEL_CXXOPTS="-std=c++17"

build --define=with_glog=true --define=libunwind=true
build --copt -DHAVE_ZLIB=1 --copt -DGFLAGS_NS=google --copt -DUSE_BTHREAD_MUTEX
build --cxxopt -Wno-error=format-security
Expand Down
11 changes: 5 additions & 6 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -179,16 +179,15 @@ bind(
)

# jsoncpp
new_git_repository(
name = "jsoncpp",
build_file = "//:thirdparties/jsoncpp.BUILD",
remote = "https://github.com/open-source-parsers/jsoncpp.git",
tag = "1.8.4",
http_archive(
name = "jsoncpp",
urls = ["https://github.com/open-source-parsers/jsoncpp/archive/refs/tags/1.9.5.tar.gz"],
strip_prefix = "jsoncpp-1.9.5",
)

bind(
name = "json",
actual = "@jsoncpp//:json",
actual = "@jsoncpp//:jsoncpp",
)

new_local_repository(
Expand Down
2 changes: 1 addition & 1 deletion copts.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ BASE_FLAGS = [
]

CXX_FLAGS = [
"-std=c++11",
"-std=c++17",
]

CURVE_GCC_FLAGS = [
Expand Down
2 changes: 1 addition & 1 deletion src/tools/curve_format_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ using curve::chunkserver::FilePoolMeta;

class CompareInternal {
public:
bool operator()(const std::string& s1, const std::string& s2) {
bool operator()(const std::string& s1, const std::string& s2) const {
auto index1 = std::atoi(s1.c_str());
auto index2 = std::atoi(s2.c_str());
return index1 < index2;
Expand Down
30 changes: 0 additions & 30 deletions thirdparties/jsoncpp.BUILD

This file was deleted.

2 changes: 1 addition & 1 deletion thirdparties/rocksdb/rocksdb
Submodule rocksdb updated 1697 files

0 comments on commit 9810e23

Please sign in to comment.