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

Fix Wpedantic warning 'extra ;' for c++ #10385

Merged
merged 10 commits into from
Aug 17, 2022
Merged

Fix Wpedantic warning 'extra ;' for c++ #10385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b136ee3
Fix Wpedantic warning 'extra ;' for c++
marjoleinheyndrickx Aug 10, 2022
8177cd0
Merge branch 'protocolbuffers:main' into main
marjoleinheyndrickx Aug 11, 2022
71af720
Use protoc version for --version
deannagarcia Aug 10, 2022
8fee1de
Update to have two distinct methods
deannagarcia Aug 10, 2022
f36b3c2
Disabling upb tests in python_cpp builds (#10392)
mkruskal-google Aug 11, 2022
4c3ab6c
Reverting changes to ruby aarch64 build. (#10394)
mkruskal-google Aug 11, 2022
7df94e2
Upgrade third_party/googletest submodule to current main branch (#10393)
acozzette Aug 12, 2022
9450259
Fixing php proto generation script to work properly during sync (#10395)
mkruskal-google Aug 12, 2022
def602d
change macro to avoid pedantic warning
marjoleinheyndrickx Aug 12, 2022
8335ad0
Merge branch 'protocolbuffers:main' into main
marjoleinheyndrickx Aug 12, 2022
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
2 changes: 1 addition & 1 deletion src/google/protobuf/descriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ namespace internal {
//

#if !defined(PROTOBUF_INTERNAL_CHECK_CLASS_SIZE)
#define PROTOBUF_INTERNAL_CHECK_CLASS_SIZE(t, expected)
#define PROTOBUF_INTERNAL_CHECK_CLASS_SIZE(t, expected) static_assert(true, "")
#endif

class FlatAllocator;
Expand Down
2 changes: 1 addition & 1 deletion src/google/protobuf/parse_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ RotRight7AndReplaceLowByte(uint64_t res, const char& byte) {
res |= 0xFF & byte;
#endif
return res;
};
}

inline PROTOBUF_ALWAYS_INLINE
const char* ReadTagInlined(const char* ptr, uint32_t* out) {
Expand Down