Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Reverts "Make fml/... compatible with .clang_tidy." #48004

Merged
merged 1 commit into from
Nov 14, 2023
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
3 changes: 2 additions & 1 deletion fml/memory/ref_counted_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ inline RefCountedThreadSafeBase::RefCountedThreadSafeBase()
: ref_count_(1u)
#ifndef NDEBUG
,
adoption_required_(true)
adoption_required_(true),
destruction_started_(false)
#endif
{
}
Expand Down
2 changes: 1 addition & 1 deletion fml/memory/weak_ptr_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class WeakPtrFlag : public fml::RefCountedThreadSafe<WeakPtrFlag> {
void Invalidate();

private:
bool is_valid_ = false;
bool is_valid_;

FML_DISALLOW_COPY_AND_ASSIGN(WeakPtrFlag);
};
Expand Down
2 changes: 1 addition & 1 deletion fml/message_loop_task_queues.h
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class MessageLoopTaskQueues {
mutable std::mutex queue_mutex_;
std::map<TaskQueueId, std::unique_ptr<TaskQueueEntry>> queue_entries_;

size_t task_queue_id_counter_ = 0;
size_t task_queue_id_counter_;

std::atomic_int order_;

Expand Down
2 changes: 1 addition & 1 deletion fml/platform/android/message_loop_android.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class MessageLoopAndroid : public MessageLoopImpl {
private:
fml::UniqueObject<ALooper*, UniqueLooperTraits> looper_;
fml::UniqueFD timer_fd_;
bool running_ = false;
bool running_;

MessageLoopAndroid();

Expand Down
2 changes: 1 addition & 1 deletion fml/shared_thread_merger.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class SharedThreadMerger
fml::TaskQueueId subsumed_;
fml::MessageLoopTaskQueues* task_queues_;
std::mutex mutex_;
bool enabled_ = false;
bool enabled_;

/// The |MergeWithLease| or |ExtendLeaseTo| method will record the caller
/// into this lease_term_by_caller_ map, |UnMergeNowIfLastOne|
Expand Down
10 changes: 5 additions & 5 deletions fml/synchronization/semaphore.cc
Original file line number Diff line number Diff line change
Expand Up @@ -170,24 +170,24 @@ class PlatformSemaphore {

namespace fml {

Semaphore::Semaphore(uint32_t count) : impl_(new PlatformSemaphore(count)) {}
Semaphore::Semaphore(uint32_t count) : _impl(new PlatformSemaphore(count)) {}

Semaphore::~Semaphore() = default;

bool Semaphore::IsValid() const {
return impl_->IsValid();
return _impl->IsValid();
}

bool Semaphore::Wait() {
return impl_->Wait();
return _impl->Wait();
}

bool Semaphore::TryWait() {
return impl_->TryWait();
return _impl->TryWait();
}

void Semaphore::Signal() {
return impl_->Signal();
return _impl->Signal();
}

} // namespace fml
2 changes: 1 addition & 1 deletion fml/synchronization/semaphore.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class Semaphore {
void Signal();

private:
std::unique_ptr<PlatformSemaphore> impl_;
std::unique_ptr<PlatformSemaphore> _impl;

FML_DISALLOW_COPY_AND_ASSIGN(Semaphore);
};
Expand Down