Skip to content

Remove redundant const of ThreadLocal #2855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wwbmmm merged 1 commit into from
Dec 31, 2024
Merged

Remove redundant const of ThreadLocal #2855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/butil/thread_key.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ class ThreadLocal {

T* get();

T* operator->() const { return get(); }
T* operator->() { return get(); }

T& operator*() const { return *get(); }
T& operator*() { return *get(); }

// Iterate through all thread local objects.
// Callback, which must accept Args params and return void,
Expand Down
15 changes: 11 additions & 4 deletions test/thread_key_unittest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ struct ThreadKeyInfo {
uint32_t seq;
};

struct ThreadKeyData {
int a{0};
};

TEST(ThreadLocalTest, sanity) {
{
ThreadKey key;
Expand All @@ -65,13 +69,16 @@ TEST(ThreadLocalTest, sanity) {
}

for (int i = 0; i < 5; ++i) {
ThreadLocal<int> tl;
ASSERT_TRUE(tl.get()!=NULL);
int* data = new int;
ThreadLocal<ThreadKeyData> tl;
ASSERT_TRUE(tl.get());
ASSERT_EQ(tl->a, 0);
auto data = new ThreadKeyData;
data->a = 1;
tl.reset(data); // tl owns data
ASSERT_EQ(data, tl.get());
ASSERT_EQ((*tl).a, 1);
tl.reset(); // data has been deleted
ASSERT_TRUE(tl.get()!=NULL);
ASSERT_TRUE(tl.get());
}
}

Expand Down