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

Change C include statements to use " instead of < #16

Merged
merged 4 commits into from
Jun 10, 2024
Merged

Change C include statements to use " instead of < #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c40edf2
start, use double quotes instead of angle brackets
ParkMyCar Jun 2, 2024
5cf2ee9
fmt, fix ubuntu-old, add some debug info for the current ubuntu
ParkMyCar Jun 10, 2024
8777fb0
try with newer version of ubuntu (and maybe clang?)
ParkMyCar Jun 10, 2024
b3b5459
remove ubuntu-old, use ubuntu-20.04 for build
ParkMyCar Jun 10, 2024
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
6 changes: 1 addition & 5 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,10 @@ jobs:
matrix:
build:
- ubuntu
- ubuntu-old
- macos
include:
- build: ubuntu
os: ubuntu-latest
rust: stable
- build: ubuntu-old
os: ubuntu-18.04
os: ubuntu-20.04
rust: stable
- build: macos
os: macos-latest
Expand Down
3 changes: 1 addition & 2 deletions protobuf-native/src/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@

#pragma once

#include <google/protobuf/compiler/importer.h>

#include "google/protobuf/compiler/importer.h"
#include "rust/cxx.h"

namespace protobuf_native {
Expand Down
2 changes: 1 addition & 1 deletion protobuf-native/src/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#pragma once

#include <absl/strings/string_view.h>
#include "absl/strings/string_view.h"

namespace protobuf_native {
namespace internal {
Expand Down
9 changes: 4 additions & 5 deletions protobuf-native/src/io.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@

#pragma once

#include <google/protobuf/io/coded_stream.h>
#include <google/protobuf/io/zero_copy_stream.h>
#include <google/protobuf/io/zero_copy_stream_impl.h>
#include <google/protobuf/io/zero_copy_stream_impl_lite.h>

#include <memory>

#include "google/protobuf/io/coded_stream.h"
#include "google/protobuf/io/zero_copy_stream.h"
#include "google/protobuf/io/zero_copy_stream_impl.h"
#include "google/protobuf/io/zero_copy_stream_impl_lite.h"
#include "rust/cxx.h"

namespace protobuf_native {
Expand Down
6 changes: 3 additions & 3 deletions protobuf-native/src/lib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@

#pragma once

#include <google/protobuf/descriptor.h>
#include <google/protobuf/descriptor.pb.h>

#include <memory>

#include "google/protobuf/descriptor.h"
#include "google/protobuf/descriptor.pb.h"

using namespace google::protobuf;

namespace protobuf_native {
Expand Down