Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ addons:
- pkg-config

before_install:
- wget https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel_0.9.0-linux-x86_64.deb
- sudo dpkg -i bazel_0.9.0-linux-x86_64.deb
- wget https://github.com/bazelbuild/bazel/releases/download/0.17.2/bazel_0.17.2-linux-x86_64.deb
- sudo dpkg -i bazel_0.17.2-linux-x86_64.deb

script:
- bazel test ...
4 changes: 2 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ http_archive(

http_archive(
name = "com_google_protobuf",
strip_prefix = "protobuf-3.5.0",
urls = ["https://github.com/google/protobuf/archive/v3.5.0.zip"],
strip_prefix = "protobuf-3.5.1",
urls = ["https://github.com/google/protobuf/archive/v3.5.1.zip"],
)

http_archive(
Expand Down
13 changes: 0 additions & 13 deletions common/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -184,23 +184,10 @@ cc_library(
cc_test(
name = "converters_test",
srcs = ["converters_test.cc"],
data = [
"@com_google_cel_spec//testdata",
],
deps = [
":converters",
":value",
"@com_google_absl//absl/memory",
"@com_google_googletest//:gtest_main",
],
)

cc_library(
name = "cel_operators",
srcs = [
"cel_operators.cc",
],
hdrs = [
"cel_operators.h",
],
)
34 changes: 0 additions & 34 deletions common/cel_operators.cc

This file was deleted.

40 changes: 0 additions & 40 deletions common/cel_operators.h

This file was deleted.

4 changes: 2 additions & 2 deletions common/enum.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ class UnnamedEnumValue final : public internal::RefCountable {
public:
~UnnamedEnumValue() = default;

inline constexpr int32_t value() const { return value_; }
inline constexpr EnumType type() const { return type_; }
inline int32_t value() const { return value_; }
inline EnumType type() const { return type_; }

std::string ToString() const;

Expand Down
4 changes: 2 additions & 2 deletions common/type.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace expr {
namespace {

constexpr const std::size_t kBasicTypeNamesSize = 10;
const auto* kBasicTypeNames = new std::array<std::string, kBasicTypeNamesSize>{
const auto* kBasicTypeNames = new std::array<std::string, kBasicTypeNamesSize>({
"null_type", // kNull
"bool", // kBool
"int", // kInt
Expand All @@ -21,7 +21,7 @@ const auto* kBasicTypeNames = new std::array<std::string, kBasicTypeNamesSize>{
"type", // kType
"map", // kMap
"list", // kList
};
});

static_assert(kBasicTypeNamesSize ==
static_cast<int>(BasicTypeValue::DO_NOT_USE),
Expand Down
4 changes: 2 additions & 2 deletions common/type.h
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@ class Type final {
inline EnumType enum_type() const { return absl::get<EnumType>(data_); }
inline ObjectType object_type() const { return absl::get<ObjectType>(data_); }

constexpr inline bool operator==(const Type& rhs) const {
inline bool operator==(const Type& rhs) const {
return data_ == rhs.data_;
}
constexpr inline bool operator!=(const Type& rhs) const {
inline bool operator!=(const Type& rhs) const {
return data_ != rhs.data_;
}

Expand Down
2 changes: 1 addition & 1 deletion internal/hash_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ std::size_t HashImpl(const T& value, specialize_for<typename T::Hasher>) {

// Specialization for enums.
template <typename T>
specialize_ift<std::is_enum<T>, std::size_t> HashImpl(T&& v) {
std::size_t HashImpl(T&& v, specialize_ift<std::is_enum<T>>) {
return Hash(static_cast<typename std::underlying_type<T>::type>(v));
}

Expand Down