Skip to content
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

Jump to bottom

Fix compile fail #81

Merged
merged 2 commits into from Dec 13, 2022
Merged

Fix compile fail #81

merged 2 commits into from Dec 13, 2022

Conversation

4kangjc
Copy link
Contributor

@4kangjc 4kangjc commented Dec 9, 2022

#64

@4kangjc 4kangjc force-pushed the fix-compile-fail branch 3 times, most recently from 715d8a5 to 6b6d09c Compare December 9, 2022 12:43
@4kangjc
Copy link
Contributor Author

4kangjc commented Dec 9, 2022

我把adjust ci分支合一下这个分支 看看所有的编译能不能过

@4kangjc
Copy link
Contributor Author

4kangjc commented Dec 9, 2022

我把adjust ci分支合一下这个分支 看看所有的编译能不能过

之后再分开来

@4kangjc
Copy link
Contributor Author

4kangjc commented Dec 9, 2022 •
edited

看样子都编译成功了, 只是async的Test失败了

0x804d8000
0x804d8000 reviewed Dec 11, 2022
View reviewed changes
.gitignore Show resolved Hide resolved
BLADE_ROOT Outdated Show resolved Hide resolved
@0x804d8000
Copy link
Collaborator

看样子都编译成功了, 只是async的Test失败了

async_test.cc里面把std::this_thread::get_id()换成fiber::GetCurrentThreadId()的话测试可以跑过吗

@4kangjc
Copy link
Contributor Author

4kangjc commented Dec 11, 2022

看样子都编译成功了, 只是async的Test失败了

async_test.cc里面把std::this_thread::get_id()换成fiber::GetCurrentThreadId()的话测试可以跑过吗

我用手机改一下看看，跑一下ci

@4kangjc
Copy link
Contributor Author

4kangjc commented Dec 11, 2022

看样子都编译成功了, 只是async的Test失败了

async_test.cc里面把std::this_thread::get_id()换成fiber::GetCurrentThreadId()的话测试可以跑过吗

我用手机改一下看看，跑一下ci

可以的

@0x804d8000
Copy link
Collaborator

除了gitignore之外我没其他问题了，另外#78好像跟这个重了，需要分开吗还是直接合#81就可以了

@4kangjc
Copy link
Contributor Author

4kangjc commented Dec 12, 2022

除了gitignore之外我没其他问题了，另外#78好像跟这个重了，需要分开吗还是直接合#81就可以了

先合这个吧，#81等这个合了，再fetch，rebase再push上去

@4kangjc
Copy link
Contributor Author

4kangjc commented Dec 12, 2022

除了gitignore之外我没其他问题了，另外#78好像跟这个重了，需要分开吗还是直接合#81就可以了

先合这个吧，#81等这个合了，再fetch，rebase再push上去

分开来好点

@4kangjc
Copy link
Contributor Author

4kangjc commented Dec 12, 2022

除了gitignore之外我没其他问题了，另外#78好像跟这个重了，需要分开吗还是直接合#81就可以了

gitignore好像是不支持./这种写法的

@0x804d8000
Copy link
Collaborator

除了gitignore之外我没其他问题了，另外#78好像跟这个重了，需要分开吗还是直接合#81就可以了

gitignore好像是不支持./这种写法的

不加路径直接写文件名呢？类似于现在.gitignore里面已有的.vscode/之类的

@4kangjc
Copy link
Contributor Author

4kangjc commented Dec 12, 2022 •
edited

除了gitignore之外我没其他问题了，另外#78好像跟这个重了，需要分开吗还是直接合#81就可以了

gitignore好像是不支持./这种写法的

不加路径直接写文件名呢？类似于现在.gitignore里面已有的.vscode/之类的

我其实是OK的哈哈，你能接受就行，想加git ignore主要是因为我经常用git reset，然后本地又有没add的话，有点难搞

@4kangjc
Copy link
Contributor Author

4kangjc commented Dec 12, 2022

除了gitignore之外我没其他问题了，另外#78好像跟这个重了，需要分开吗还是直接合#81就可以了

gitignore好像是不支持./这种写法的

不加路径直接写文件名呢？类似于现在.gitignore里面已有的.vscode/之类的

我其实是OK的哈哈，想加git ignore主要是因为我经常用git reset，然后本地又有没add的话，有点难搞

Screenshot_20221213_005353.jpg

@0x804d8000
Copy link
Collaborator

查了下文档，确实应该以/开头，这儿我没问题了

看看async_test.cc里面include顺序，那个好像没必要改，其他的我ok了

@0x804d8000 0x804d8000 merged commit 430f7e0 into Tencent:master Dec 13, 2022
@0x804d8000
Copy link
Collaborator

Merged, thanks!

@0x804d8000 0x804d8000 mentioned this pull request Dec 15, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0x804d8000 0x804d8000 0x804d8000 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@4kangjc @0x804d8000