diff options
| author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2008-11-14 17:29:32 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2008-11-14 17:29:32 +0000 |
| commit | a2a32c20434807e9966e3f48375f9419134d1b55 (patch) | |
| tree | 16f115d52249335124cba31e959253275af624c4 /src/google/protobuf/descriptor_unittest.cc | |
| parent | 8da400ed12284575895cf7d5e4425435d4e43c42 (diff) | |
| download | protobuf-a2a32c20434807e9966e3f48375f9419134d1b55.tar.gz protobuf-a2a32c20434807e9966e3f48375f9419134d1b55.tar.bz2 protobuf-a2a32c20434807e9966e3f48375f9419134d1b55.zip | |
Support HP C++ on Tru64.
Patch (mostly) by Vincent Choinière <Choiniere.Vincent@hydro.qc.ca>.
Diffstat (limited to 'src/google/protobuf/descriptor_unittest.cc')
| -rw-r--r-- | src/google/protobuf/descriptor_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/descriptor_unittest.cc b/src/google/protobuf/descriptor_unittest.cc index c919b80d..b7dac69a 100644 --- a/src/google/protobuf/descriptor_unittest.cc +++ b/src/google/protobuf/descriptor_unittest.cc @@ -53,7 +53,7 @@ namespace google { namespace protobuf { -namespace { +namespace GOOGLE_ANONYMOUS_NAMESPACE{ // Some helpers to make assembling descriptors faster. DescriptorProto* AddMessage(FileDescriptorProto* file, const string& name) { @@ -1323,7 +1323,7 @@ class MiscTest : public testing::Test { DescriptorProto* message = AddMessage(&file_proto, "TestMessage"); FieldDescriptorProto* field = AddField(message, "foo", 1, FieldDescriptorProto::LABEL_OPTIONAL, - static_cast<FieldDescriptorProto::Type>(type)); + static_cast<FieldDescriptorProto::Type>(static_cast<int>(type))); if (type == FieldDescriptor::TYPE_MESSAGE || type == FieldDescriptor::TYPE_GROUP) { |