summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/mbgl/style/property_value.hpp2
-rw-r--r--platform/default/sqlite3.cpp8
-rw-r--r--platform/default/sqlite3.hpp4
-rw-r--r--platform/qt/src/sqlite3.cpp9
4 files changed, 0 insertions, 23 deletions
diff --git a/include/mbgl/style/property_value.hpp b/include/mbgl/style/property_value.hpp
index 1b7429dae6..8bec7388e5 100644
--- a/include/mbgl/style/property_value.hpp
+++ b/include/mbgl/style/property_value.hpp
@@ -34,8 +34,6 @@ public:
const T & asConstant() const { return value.template get< T >(); }
const CameraFunction<T>& asCameraFunction() const { return value.template get<CameraFunction<T>>(); }
- explicit operator bool() const { return !isUndefined(); };
-
template <typename Evaluator>
auto evaluate(const Evaluator& evaluator) const {
return Value::visit(value, evaluator);
diff --git a/platform/default/sqlite3.cpp b/platform/default/sqlite3.cpp
index e33e7480a7..304d5e9aba 100644
--- a/platform/default/sqlite3.cpp
+++ b/platform/default/sqlite3.cpp
@@ -110,10 +110,6 @@ Database &Database::operator=(Database &&other) {
Database::~Database() {
}
-Database::operator bool() const {
- return impl.operator bool();
-}
-
void Database::setBusyTimeout(std::chrono::milliseconds timeout) {
assert(impl);
const int err = sqlite3_busy_timeout(impl->db,
@@ -158,10 +154,6 @@ Statement &Statement::operator=(Statement &&other) {
Statement::~Statement() {
}
-Statement::operator bool() const {
- return impl.operator bool();
-}
-
template <> void Statement::bind(int offset, std::nullptr_t) {
assert(impl);
impl->check(sqlite3_bind_null(impl->stmt, offset));
diff --git a/platform/default/sqlite3.hpp b/platform/default/sqlite3.hpp
index 2cbc3cf48b..82e3ceff6d 100644
--- a/platform/default/sqlite3.hpp
+++ b/platform/default/sqlite3.hpp
@@ -46,8 +46,6 @@ public:
~Database();
Database &operator=(Database &&);
- explicit operator bool() const;
-
void setBusyTimeout(std::chrono::milliseconds);
void exec(const std::string &sql);
Statement prepare(const char *query);
@@ -69,8 +67,6 @@ public:
~Statement();
Statement &operator=(Statement &&);
- explicit operator bool() const;
-
template <typename T> void bind(int offset, T value);
// Text
diff --git a/platform/qt/src/sqlite3.cpp b/platform/qt/src/sqlite3.cpp
index 3470c36910..8df279c25d 100644
--- a/platform/qt/src/sqlite3.cpp
+++ b/platform/qt/src/sqlite3.cpp
@@ -130,10 +130,6 @@ Database &Database::operator=(Database &&other) {
Database::~Database() {
}
-Database::operator bool() const {
- return impl.operator bool();
-}
-
void Database::setBusyTimeout(std::chrono::milliseconds timeout) {
assert(impl);
std::string timeoutStr = mbgl::util::toString(timeout.count());
@@ -191,11 +187,6 @@ Statement &Statement::operator=(Statement &&other) {
Statement::~Statement() {
}
-Statement::operator bool() const {
- assert(impl);
- return impl.operator bool();
-}
-
template void Statement::bind(int, int64_t);
template <typename T>