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

Remove usages of no-op POEMs (protobuf) #2228

Merged
merged 1 commit into from
Jan 18, 2024
Merged

Remove usages of no-op POEMs (protobuf) #2228

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: 0 additions & 4 deletions third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_file.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,6 @@ void FileGenerator::GenerateSource(io::Printer* printer) {
"#include <google/protobuf/stubs/common.h>\n"
"#include <google/protobuf/stubs/port.h>\n"
"#include <google/protobuf/stubs/once.h>\n"
// Cobalt's starboard porting. We did not guard this part with
// #if defined(STARBOARD) because protoc uses native build and STARBOARD
// is not defined when compiling it.
"#include <google/protobuf/stubs/starboard_poem.h>\n"
"#include <google/protobuf/io/coded_stream.h>\n"
"#include <google/protobuf/wire_format_lite_inl.h>\n",
"filename", file_->name(),
Expand Down
2 changes: 0 additions & 2 deletions third_party/protobuf/src/google/protobuf/io/coded_stream.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
// will not cross the end of the buffer, since we can avoid a lot
// of branching in this case.

#include "starboard/client_porting/poem/string_poem.h"

#include <google/protobuf/io/coded_stream_inl.h>
#include <algorithm>
#include <utility>
Expand Down
4 changes: 0 additions & 4 deletions third_party/protobuf/src/google/protobuf/repeated_field.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.

#ifdef STARBOARD
#include "starboard/client_porting/poem/string_poem.h"
#endif

#include <algorithm>

#include <google/protobuf/repeated_field.h>
Expand Down
7 changes: 0 additions & 7 deletions third_party/protobuf/src/google/protobuf/stubs/bytestream.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,9 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#ifdef STARBOARD
#include "starboard/client_porting/poem/string_poem.h"
#endif

#include <google/protobuf/stubs/bytestream.h>

#ifndef STARBOARD
#include <string.h>
#endif // STARBOARD

#include <algorithm>

namespace google {
Expand Down
5 changes: 0 additions & 5 deletions third_party/protobuf/src/google/protobuf/stubs/stringpiece.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@
#include <google/protobuf/stubs/stringpiece.h>

#include <string.h>

#ifdef STARBOARD
#include "starboard/client_porting/poem/string_poem.h"
#endif

#include <algorithm>
#include <climits>
#include <string>
Expand Down
9 changes: 1 addition & 8 deletions third_party/protobuf/src/google/protobuf/stubs/stringprintf.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,12 @@

#include <google/protobuf/stubs/stringprintf.h>

#ifndef STARBOARD
#include <stdio.h> // MSVC requires this for _vsnprintf
#endif // defined(STARBOARD)

#include <errno.h>
#include <stdarg.h> // For va_list and related operations
#include <stdio.h> // MSVC requires this for _vsnprintf
#include <vector>
#include <google/protobuf/stubs/common.h>

#ifdef STARBOARD
#include "starboard/client_porting/poem/stdio_poem.h"
#endif

namespace google {
namespace protobuf {

Expand Down
4 changes: 0 additions & 4 deletions third_party/protobuf/src/google/protobuf/stubs/structurally_valid.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
// Copyright 2005-2008 Google Inc. All Rights Reserved.
// Author: [email protected] (Jim Meehan)

#ifdef STARBOARD
#include "starboard/client_porting/poem/string_poem.h"
#endif

#include <google/protobuf/stubs/common.h>

#include <google/protobuf/stubs/stringpiece.h>
Expand Down
Loading