[csw-devel] SF.net SVN: gar:[8754] csw/mgar/pkg/protobuf/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Tue Feb 23 08:41:51 CET 2010
Revision: 8754
http://gar.svn.sourceforge.net/gar/?rev=8754&view=rev
Author: wahwah
Date: 2010-02-23 07:41:51 +0000 (Tue, 23 Feb 2010)
Log Message:
-----------
protobuf: It builds now on Solaris 8 with SOS11 and stlport4
Modified Paths:
--------------
csw/mgar/pkg/protobuf/trunk/Makefile
csw/mgar/pkg/protobuf/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/protobuf/trunk/files/0001-Patches-from-GAR.patch
csw/mgar/pkg/protobuf/trunk/files/0002-std-map-in-two-more-files.patch
Removed Paths:
-------------
csw/mgar/pkg/protobuf/trunk/files/std-map-2.patch
csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch
csw/mgar/pkg/protobuf/trunk/files/std-map-in-google-protobuf-extension_set.cc.patch
csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch
csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch
csw/mgar/pkg/protobuf/trunk/files/stdint-and-ddi.patch
csw/mgar/pkg/protobuf/trunk/files/stdint-gcc.patch
csw/mgar/pkg/protobuf/trunk/files/strtof.patch
csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch
Modified: csw/mgar/pkg/protobuf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/protobuf/trunk/Makefile 2010-02-23 07:37:33 UTC (rev 8753)
+++ csw/mgar/pkg/protobuf/trunk/Makefile 2010-02-23 07:41:51 UTC (rev 8754)
@@ -4,6 +4,9 @@
# Still doesn't build, I've filed a bug:
# http://code.google.com/p/protobuf/issues/detail?id=166
+#
+# About using stlport4
+# http://developers.sun.com/solaris/articles/cmp_stlport_libCstd.html
GARNAME = protobuf
GARVERSION = 2.3.0
@@ -14,22 +17,19 @@
extensible format. Google uses Protocol Buffers for almost all of its
internal RPC protocols and file formats.
endef
-PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386
+# PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386
SPKG_SOURCEURL = http://code.google.com/p/protobuf/
MASTER_SITES = $(GOOGLE_MIRROR)
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-PATCHFILES = stdint-and-ddi.patch
-PATCHFILES += std-map-in-google-protobuf-extension_set.cc.patch
-PATCHFILES += stdint-gcc.patch
-PATCHFILES += std-map-2.patch
-PATCHFILES += vector-in-repeated_field.h.patch
-PATCHFILES += strtof.patch
-PATCHFILES += std-map-again.patch
-PATCHFILES += std-map-yet-again.patch
-PATCHFILES += std-map-yet-again-include-map.patch
+PATCHFILES += 0001-Patches-from-GAR.patch
+PATCHFILES += 0002-std-map-in-two-more-files.patch
LICENSE = COPYING.txt
+EXTRA_CFLAGS =
+EXTRA_CXXFLAGS = -library=stlport4 -library=no%Cstd
+EXTRA_LDFLAGS = -lCrun -lm
CONFIGURE_ARGS = $(DIRPATHS)
-GARCOMPILER = SOS12
-# GARCOMPILER = GNU
+TEST_TARGET = check
+RUNTIME_DEP_PKGS_CSWprotobuf += CSWstlport
+RUNTIME_DEP_PKGS_CSWprotobuf += CSWzlib
include gar/category.mk
Modified: csw/mgar/pkg/protobuf/trunk/checksums
===================================================================
--- csw/mgar/pkg/protobuf/trunk/checksums 2010-02-23 07:37:33 UTC (rev 8753)
+++ csw/mgar/pkg/protobuf/trunk/checksums 2010-02-23 07:41:51 UTC (rev 8754)
@@ -1,10 +1,3 @@
+9dbbdcb35c7f44b3d53405021c388c3d 0001-Patches-from-GAR.patch
+3412715e07bdb891951c8e72cfd937af 0002-std-map-in-two-more-files.patch
65dba2c04923595b6f0a6a44d8106f0a protobuf-2.3.0.tar.gz
-ca4082250f24ec40fbce6993bcfb87cd std-map-2.patch
-0b2f1b0bd5747aefe412af51b7434294 std-map-again.patch
-603e491e286232a90cf9b378317db9f2 std-map-in-google-protobuf-extension_set.cc.patch
-e02c84596b8b4a03d5a160469edc8187 std-map-yet-again-include-map.patch
-20dee4f5aa23962864d55423fcbc63aa std-map-yet-again.patch
-2c16ccb4bd7120f71d557d2cb9841c42 stdint-and-ddi.patch
-d57e96bdf15bb207ba7df46d83b1a6bd stdint-gcc.patch
-c22e22af396037fd24f8c5e276b31d98 strtof.patch
-d2919404a19d4dd38d4e4378014b4518 vector-in-repeated_field.h.patch
Added: csw/mgar/pkg/protobuf/trunk/files/0001-Patches-from-GAR.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/0001-Patches-from-GAR.patch (rev 0)
+++ csw/mgar/pkg/protobuf/trunk/files/0001-Patches-from-GAR.patch 2010-02-23 07:41:51 UTC (rev 8754)
@@ -0,0 +1,372 @@
+From 8a36482ed025a9ae5adbc43e7285028119dab121 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 21 Feb 2010 20:07:10 +0100
+Subject: [PATCH 1/2] Patches from GAR
+
+---
+ .../protobuf/compiler/command_line_interface.h | 2 +
+ src/google/protobuf/descriptor_database.cc | 9 ++--
+ src/google/protobuf/descriptor_database.h | 2 +-
+ src/google/protobuf/extension_set.cc | 52 ++++++++++----------
+ src/google/protobuf/repeated_field.h | 1 +
+ src/google/protobuf/stubs/common.h | 5 ++-
+ src/google/protobuf/stubs/strutil.h | 4 ++
+ 7 files changed, 43 insertions(+), 32 deletions(-)
+
+diff --git a/src/google/protobuf/compiler/command_line_interface.h b/src/google/protobuf/compiler/command_line_interface.h
+index d25a50e..3815d5c 100644
+--- a/src/google/protobuf/compiler/command_line_interface.h
++++ b/src/google/protobuf/compiler/command_line_interface.h
+@@ -55,6 +55,8 @@ template<typename T> class RepeatedPtrField; // repeated_field.h
+
+ namespace compiler {
+
++using std::map;
++
+ class CodeGenerator; // code_generator.h
+ class OutputDirectory; // code_generator.h
+ class DiskSourceTree; // importer.h
+diff --git a/src/google/protobuf/descriptor_database.cc b/src/google/protobuf/descriptor_database.cc
+index 95708d9..ad29ed1 100644
+--- a/src/google/protobuf/descriptor_database.cc
++++ b/src/google/protobuf/descriptor_database.cc
+@@ -35,6 +35,7 @@
+ #include <google/protobuf/descriptor_database.h>
+
+ #include <set>
++#include <map>
+
+ #include <google/protobuf/descriptor.pb.h>
+ #include <google/protobuf/wire_format_lite_inl.h>
+@@ -97,7 +98,7 @@ bool SimpleDescriptorDatabase::DescriptorIndex<Value>::AddSymbol(
+
+ // Try to look up the symbol to make sure a super-symbol doesn't already
+ // exist.
+- typename map<string, Value>::iterator iter = FindLastLessOrEqual(name);
++ typename std::map<string, Value>::iterator iter = FindLastLessOrEqual(name);
+
+ if (iter == by_symbol_.end()) {
+ // Apparently the map is currently empty. Just insert and be done with it.
+@@ -179,7 +180,7 @@ Value SimpleDescriptorDatabase::DescriptorIndex<Value>::FindFile(
+ template <typename Value>
+ Value SimpleDescriptorDatabase::DescriptorIndex<Value>::FindSymbol(
+ const string& name) {
+- typename map<string, Value>::iterator iter = FindLastLessOrEqual(name);
++ typename std::map<string, Value>::iterator iter = FindLastLessOrEqual(name);
+
+ return (iter != by_symbol_.end() && IsSubSymbol(iter->first, name)) ?
+ iter->second : Value();
+@@ -198,7 +199,7 @@ template <typename Value>
+ bool SimpleDescriptorDatabase::DescriptorIndex<Value>::FindAllExtensionNumbers(
+ const string& containing_type,
+ vector<int>* output) {
+- typename map<pair<string, int>, Value >::const_iterator it =
++ typename std::map<pair<string, int>, Value >::const_iterator it =
+ by_extension_.lower_bound(make_pair(containing_type, 0));
+ bool success = false;
+
+@@ -212,7 +213,7 @@ bool SimpleDescriptorDatabase::DescriptorIndex<Value>::FindAllExtensionNumbers(
+ }
+
+ template <typename Value>
+-typename map<string, Value>::iterator
++typename std::map<string, Value>::iterator
+ SimpleDescriptorDatabase::DescriptorIndex<Value>::FindLastLessOrEqual(
+ const string& name) {
+ // Find the last key in the map which sorts less than or equal to the
+diff --git a/src/google/protobuf/descriptor_database.h b/src/google/protobuf/descriptor_database.h
+index f32b1db..49f0de6 100644
+--- a/src/google/protobuf/descriptor_database.h
++++ b/src/google/protobuf/descriptor_database.h
+@@ -233,7 +233,7 @@ class LIBPROTOBUF_EXPORT SimpleDescriptorDatabase : public DescriptorDatabase {
+
+ // Find the last entry in the by_symbol_ map whose key is less than or
+ // equal to the given name.
+- typename map<string, Value>::iterator FindLastLessOrEqual(
++ typename std::map<string, Value>::iterator FindLastLessOrEqual(
+ const string& name);
+
+ // True if either the arguments are equal or super_symbol identifies a
+diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc
+index 6084885..2cd66f6 100644
+--- a/src/google/protobuf/extension_set.cc
++++ b/src/google/protobuf/extension_set.cc
+@@ -162,7 +162,7 @@ void ExtensionSet::RegisterMessageExtension(const MessageLite* containing_type,
+ ExtensionSet::ExtensionSet() {}
+
+ ExtensionSet::~ExtensionSet() {
+- for (map<int, Extension>::iterator iter = extensions_.begin();
++ for (std::map<int, Extension>::iterator iter = extensions_.begin();
+ iter != extensions_.end(); ++iter) {
+ iter->second.Free();
+ }
+@@ -174,20 +174,20 @@ ExtensionSet::~ExtensionSet() {
+ // vector<const FieldDescriptor*>* output) const
+
+ bool ExtensionSet::Has(int number) const {
+- map<int, Extension>::const_iterator iter = extensions_.find(number);
++ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
+ if (iter == extensions_.end()) return false;
+ GOOGLE_DCHECK(!iter->second.is_repeated);
+ return !iter->second.is_cleared;
+ }
+
+ int ExtensionSet::ExtensionSize(int number) const {
+- map<int, Extension>::const_iterator iter = extensions_.find(number);
++ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
+ if (iter == extensions_.end()) return false;
+ return iter->second.GetSize();
+ }
+
+ void ExtensionSet::ClearExtension(int number) {
+- map<int, Extension>::iterator iter = extensions_.find(number);
++ std::map<int, Extension>::iterator iter = extensions_.find(number);
+ if (iter == extensions_.end()) return;
+ iter->second.Clear();
+ }
+@@ -215,7 +215,7 @@ enum Cardinality {
+ \
+ LOWERCASE ExtensionSet::Get##CAMELCASE(int number, \
+ LOWERCASE default_value) const { \
+- map<int, Extension>::const_iterator iter = extensions_.find(number); \
++ std::map<int, Extension>::const_iterator iter = extensions_.find(number); \
+ if (iter == extensions_.end() || iter->second.is_cleared) { \
+ return default_value; \
+ } else { \
+@@ -240,7 +240,7 @@ void ExtensionSet::Set##CAMELCASE(int number, FieldType type, \
+ } \
+ \
+ LOWERCASE ExtensionSet::GetRepeated##CAMELCASE(int number, int index) const { \
+- map<int, Extension>::const_iterator iter = extensions_.find(number); \
++ std::map<int, Extension>::const_iterator iter = extensions_.find(number); \
+ GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; \
+ GOOGLE_DCHECK_TYPE(iter->second, REPEATED, UPPERCASE); \
+ return iter->second.repeated_##LOWERCASE##_value->Get(index); \
+@@ -248,7 +248,7 @@ LOWERCASE ExtensionSet::GetRepeated##CAMELCASE(int number, int index) const { \
+ \
+ void ExtensionSet::SetRepeated##CAMELCASE( \
+ int number, int index, LOWERCASE value) { \
+- map<int, Extension>::iterator iter = extensions_.find(number); \
++ std::map<int, Extension>::iterator iter = extensions_.find(number); \
+ GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; \
+ GOOGLE_DCHECK_TYPE(iter->second, REPEATED, UPPERCASE); \
+ iter->second.repeated_##LOWERCASE##_value->Set(index, value); \
+@@ -285,7 +285,7 @@ PRIMITIVE_ACCESSORS( BOOL, bool, Bool)
+ // Enums
+
+ int ExtensionSet::GetEnum(int number, int default_value) const {
+- map<int, Extension>::const_iterator iter = extensions_.find(number);
++ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
+ if (iter == extensions_.end() || iter->second.is_cleared) {
+ // Not present. Return the default value.
+ return default_value;
+@@ -310,14 +310,14 @@ void ExtensionSet::SetEnum(int number, FieldType type, int value,
+ }
+
+ int ExtensionSet::GetRepeatedEnum(int number, int index) const {
+- map<int, Extension>::const_iterator iter = extensions_.find(number);
++ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
+ GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
+ GOOGLE_DCHECK_TYPE(iter->second, REPEATED, ENUM);
+ return iter->second.repeated_enum_value->Get(index);
+ }
+
+ void ExtensionSet::SetRepeatedEnum(int number, int index, int value) {
+- map<int, Extension>::iterator iter = extensions_.find(number);
++ std::map<int, Extension>::iterator iter = extensions_.find(number);
+ GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
+ GOOGLE_DCHECK_TYPE(iter->second, REPEATED, ENUM);
+ iter->second.repeated_enum_value->Set(index, value);
+@@ -345,7 +345,7 @@ void ExtensionSet::AddEnum(int number, FieldType type,
+
+ const string& ExtensionSet::GetString(int number,
+ const string& default_value) const {
+- map<int, Extension>::const_iterator iter = extensions_.find(number);
++ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
+ if (iter == extensions_.end() || iter->second.is_cleared) {
+ // Not present. Return the default value.
+ return default_value;
+@@ -371,14 +371,14 @@ string* ExtensionSet::MutableString(int number, FieldType type,
+ }
+
+ const string& ExtensionSet::GetRepeatedString(int number, int index) const {
+- map<int, Extension>::const_iterator iter = extensions_.find(number);
++ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
+ GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
+ GOOGLE_DCHECK_TYPE(iter->second, REPEATED, STRING);
+ return iter->second.repeated_string_value->Get(index);
+ }
+
+ string* ExtensionSet::MutableRepeatedString(int number, int index) {
+- map<int, Extension>::iterator iter = extensions_.find(number);
++ std::map<int, Extension>::iterator iter = extensions_.find(number);
+ GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
+ GOOGLE_DCHECK_TYPE(iter->second, REPEATED, STRING);
+ return iter->second.repeated_string_value->Mutable(index);
+@@ -404,7 +404,7 @@ string* ExtensionSet::AddString(int number, FieldType type,
+
+ const MessageLite& ExtensionSet::GetMessage(
+ int number, const MessageLite& default_value) const {
+- map<int, Extension>::const_iterator iter = extensions_.find(number);
++ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
+ if (iter == extensions_.end()) {
+ // Not present. Return the default value.
+ return default_value;
+@@ -442,14 +442,14 @@ MessageLite* ExtensionSet::MutableMessage(int number, FieldType type,
+
+ const MessageLite& ExtensionSet::GetRepeatedMessage(
+ int number, int index) const {
+- map<int, Extension>::const_iterator iter = extensions_.find(number);
++ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
+ GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
+ GOOGLE_DCHECK_TYPE(iter->second, REPEATED, MESSAGE);
+ return iter->second.repeated_message_value->Get(index);
+ }
+
+ MessageLite* ExtensionSet::MutableRepeatedMessage(int number, int index) {
+- map<int, Extension>::iterator iter = extensions_.find(number);
++ std::map<int, Extension>::iterator iter = extensions_.find(number);
+ GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
+ GOOGLE_DCHECK_TYPE(iter->second, REPEATED, MESSAGE);
+ return iter->second.repeated_message_value->Mutable(index);
+@@ -488,7 +488,7 @@ MessageLite* ExtensionSet::AddMessage(int number, FieldType type,
+ #undef GOOGLE_DCHECK_TYPE
+
+ void ExtensionSet::RemoveLast(int number) {
+- map<int, Extension>::iterator iter = extensions_.find(number);
++ std::map<int, Extension>::iterator iter = extensions_.find(number);
+ GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
+
+ Extension* extension = &iter->second;
+@@ -529,7 +529,7 @@ void ExtensionSet::RemoveLast(int number) {
+ }
+
+ void ExtensionSet::SwapElements(int number, int index1, int index2) {
+- map<int, Extension>::iterator iter = extensions_.find(number);
++ std::map<int, Extension>::iterator iter = extensions_.find(number);
+ GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
+
+ Extension* extension = &iter->second;
+@@ -572,14 +572,14 @@ void ExtensionSet::SwapElements(int number, int index1, int index2) {
+ // ===================================================================
+
+ void ExtensionSet::Clear() {
+- for (map<int, Extension>::iterator iter = extensions_.begin();
++ for (std::map<int, Extension>::iterator iter = extensions_.begin();
+ iter != extensions_.end(); ++iter) {
+ iter->second.Clear();
+ }
+ }
+
+ void ExtensionSet::MergeFrom(const ExtensionSet& other) {
+- for (map<int, Extension>::const_iterator iter = other.extensions_.begin();
++ for (std::map<int, Extension>::const_iterator iter = other.extensions_.begin();
+ iter != other.extensions_.end(); ++iter) {
+ const Extension& other_extension = iter->second;
+
+@@ -682,7 +682,7 @@ void ExtensionSet::Swap(ExtensionSet* x) {
+ bool ExtensionSet::IsInitialized() const {
+ // Extensions are never required. However, we need to check that all
+ // embedded messages are initialized.
+- for (map<int, Extension>::const_iterator iter = extensions_.begin();
++ for (std::map<int, Extension>::const_iterator iter = extensions_.begin();
+ iter != extensions_.end(); ++iter) {
+ const Extension& extension = iter->second;
+ if (cpp_type(extension.type) == WireFormatLite::CPPTYPE_MESSAGE) {
+@@ -1001,7 +1001,7 @@ bool ExtensionSet::ParseMessageSetItem(io::CodedInputStream* input,
+ void ExtensionSet::SerializeWithCachedSizes(
+ int start_field_number, int end_field_number,
+ io::CodedOutputStream* output) const {
+- map<int, Extension>::const_iterator iter;
++ std::map<int, Extension>::const_iterator iter;
+ for (iter = extensions_.lower_bound(start_field_number);
+ iter != extensions_.end() && iter->first < end_field_number;
+ ++iter) {
+@@ -1011,7 +1011,7 @@ void ExtensionSet::SerializeWithCachedSizes(
+
+ void ExtensionSet::SerializeMessageSetWithCachedSizes(
+ io::CodedOutputStream* output) const {
+- map<int, Extension>::const_iterator iter;
++ std::map<int, Extension>::const_iterator iter;
+ for (iter = extensions_.begin(); iter != extensions_.end(); ++iter) {
+ iter->second.SerializeMessageSetItemWithCachedSizes(iter->first, output);
+ }
+@@ -1020,7 +1020,7 @@ void ExtensionSet::SerializeMessageSetWithCachedSizes(
+ int ExtensionSet::ByteSize() const {
+ int total_size = 0;
+
+- for (map<int, Extension>::const_iterator iter = extensions_.begin();
++ for (std::map<int, Extension>::const_iterator iter = extensions_.begin();
+ iter != extensions_.end(); ++iter) {
+ total_size += iter->second.ByteSize(iter->first);
+ }
+@@ -1031,7 +1031,7 @@ int ExtensionSet::ByteSize() const {
+ int ExtensionSet::MessageSetByteSize() const {
+ int total_size = 0;
+
+- for (map<int, Extension>::const_iterator iter = extensions_.begin();
++ for (std::map<int, Extension>::const_iterator iter = extensions_.begin();
+ iter != extensions_.end(); ++iter) {
+ total_size += iter->second.MessageSetItemByteSize(iter->first);
+ }
+@@ -1045,7 +1045,7 @@ int ExtensionSet::MessageSetByteSize() const {
+ bool ExtensionSet::MaybeNewExtension(int number,
+ const FieldDescriptor* descriptor,
+ Extension** result) {
+- pair<map<int, Extension>::iterator, bool> insert_result =
++ pair<std::map<int, Extension>::iterator, bool> insert_result =
+ extensions_.insert(make_pair(number, Extension()));
+ *result = &insert_result.first->second;
+ (*result)->descriptor = descriptor;
+diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h
+index defdefe..39138f0 100644
+--- a/src/google/protobuf/repeated_field.h
++++ b/src/google/protobuf/repeated_field.h
+@@ -48,6 +48,7 @@
+
+ #include <string>
+ #include <iterator>
++#include <vector>
+ #include <google/protobuf/stubs/common.h>
+ #include <google/protobuf/message_lite.h>
+
+diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
+index 551ee4a..f000c76 100644
+--- a/src/google/protobuf/stubs/common.h
++++ b/src/google/protobuf/stubs/common.h
+@@ -40,13 +40,16 @@
+ #include <cstddef>
+ #include <string>
+ #include <string.h>
+-#if defined(__osf__)
++#if defined(__osf__) || defined(__SUNPRO_CC) || defined(__sun__)
+ // Tru64 lacks stdint.h, but has inttypes.h which defines a superset of
+ // what stdint.h would define.
+ #include <inttypes.h>
+ #elif !defined(_MSC_VER)
+ #include <stdint.h>
+ #endif
++#if defined(__SUNPRO_CC) || defined(__sun__)
++#include <sys/ddi.h>
++#endif
+
+ namespace std {}
+
+diff --git a/src/google/protobuf/stubs/strutil.h b/src/google/protobuf/stubs/strutil.h
+index 777694b..b22babe 100644
+--- a/src/google/protobuf/stubs/strutil.h
++++ b/src/google/protobuf/stubs/strutil.h
+@@ -37,6 +37,10 @@
+ #include <vector>
+ #include <google/protobuf/stubs/common.h>
+
++#if defined(__SUNPRO_CC)
++#define strtof strtod
++#endif
++
+ namespace google {
+ namespace protobuf {
+
+--
+1.6.6
+
Added: csw/mgar/pkg/protobuf/trunk/files/0002-std-map-in-two-more-files.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/0002-std-map-in-two-more-files.patch (rev 0)
+++ csw/mgar/pkg/protobuf/trunk/files/0002-std-map-in-two-more-files.patch 2010-02-23 07:41:51 UTC (rev 8754)
@@ -0,0 +1,116 @@
+From 7e368ce421202baea74a89d03a516ffc95c788ae Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Tue, 23 Feb 2010 06:12:10 +0100
+Subject: [PATCH 2/2] std::map in two more files
+
+---
+ src/google/protobuf/descriptor_database.cc | 2 +-
+ src/google/protobuf/extension_set_heavy.cc | 12 ++++++------
+ src/google/protobuf/io/printer.cc | 8 ++++----
+ 3 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/google/protobuf/descriptor_database.cc b/src/google/protobuf/descriptor_database.cc
+index ad29ed1..7d94853 100644
+--- a/src/google/protobuf/descriptor_database.cc
++++ b/src/google/protobuf/descriptor_database.cc
+@@ -219,7 +219,7 @@ SimpleDescriptorDatabase::DescriptorIndex<Value>::FindLastLessOrEqual(
+ // Find the last key in the map which sorts less than or equal to the
+ // symbol name. Since upper_bound() returns the *first* key that sorts
+ // *greater* than the input, we want the element immediately before that.
+- typename map<string, Value>::iterator iter = by_symbol_.upper_bound(name);
++ typename std::map<string, Value>::iterator iter = by_symbol_.upper_bound(name);
+ if (iter != by_symbol_.begin()) --iter;
+ return iter;
+ }
+diff --git a/src/google/protobuf/extension_set_heavy.cc b/src/google/protobuf/extension_set_heavy.cc
+index 2721f15..6a62005 100644
+--- a/src/google/protobuf/extension_set_heavy.cc
++++ b/src/google/protobuf/extension_set_heavy.cc
+@@ -68,7 +68,7 @@ class DescriptorPoolExtensionFinder : public ExtensionFinder {
+ void ExtensionSet::AppendToList(const Descriptor* containing_type,
+ const DescriptorPool* pool,
+ vector<const FieldDescriptor*>* output) const {
+- for (map<int, Extension>::const_iterator iter = extensions_.begin();
++ for (std::map<int, Extension>::const_iterator iter = extensions_.begin();
+ iter != extensions_.end(); ++iter) {
+ bool has = false;
+ if (iter->second.is_repeated) {
+@@ -112,7 +112,7 @@ inline FieldDescriptor::CppType cpp_type(FieldType type) {
+ const MessageLite& ExtensionSet::GetMessage(int number,
+ const Descriptor* message_type,
+ MessageFactory* factory) const {
+- map<int, Extension>::const_iterator iter = extensions_.find(number);
++ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
+ if (iter == extensions_.end() || iter->second.is_cleared) {
+ // Not present. Return the default value.
+ return *factory->GetPrototype(message_type);
+@@ -234,8 +234,8 @@ bool ExtensionSet::ParseMessageSet(io::CodedInputStream* input,
+
+ int ExtensionSet::SpaceUsedExcludingSelf() const {
+ int total_size =
+- extensions_.size() * sizeof(map<int, Extension>::value_type);
+- for (map<int, Extension>::const_iterator iter = extensions_.begin(),
++ extensions_.size() * sizeof(std::map<int, Extension>::value_type);
++ for (std::map<int, Extension>::const_iterator iter = extensions_.begin(),
+ end = extensions_.end();
+ iter != end;
+ ++iter) {
+@@ -301,7 +301,7 @@ int ExtensionSet::Extension::SpaceUsedExcludingSelf() const {
+ uint8* ExtensionSet::SerializeWithCachedSizesToArray(
+ int start_field_number, int end_field_number,
+ uint8* target) const {
+- map<int, Extension>::const_iterator iter;
++ std::map<int, Extension>::const_iterator iter;
+ for (iter = extensions_.lower_bound(start_field_number);
+ iter != extensions_.end() && iter->first < end_field_number;
+ ++iter) {
+@@ -313,7 +313,7 @@ uint8* ExtensionSet::SerializeWithCachedSizesToArray(
+
+ uint8* ExtensionSet::SerializeMessageSetWithCachedSizesToArray(
+ uint8* target) const {
+- map<int, Extension>::const_iterator iter;
++ std::map<int, Extension>::const_iterator iter;
+ for (iter = extensions_.begin(); iter != extensions_.end(); ++iter) {
+ target = iter->second.SerializeMessageSetItemWithCachedSizesToArray(
+ iter->first, target);
+diff --git a/src/google/protobuf/io/printer.cc b/src/google/protobuf/io/printer.cc
+index c7d3074..4d583ef 100644
+--- a/src/google/protobuf/io/printer.cc
++++ b/src/google/protobuf/io/printer.cc
+@@ -93,7 +93,7 @@ void Printer::Print(const map<string, string>& variables, const char* text) {
+ WriteRaw(&variable_delimiter_, 1);
+ } else {
+ // Replace with the variable's value.
+- map<string, string>::const_iterator iter = variables.find(varname);
++ std::map<string, string>::const_iterator iter = variables.find(varname);
+ if (iter == variables.end()) {
+ GOOGLE_LOG(DFATAL) << " Undefined variable: " << varname;
+ } else {
+@@ -112,13 +112,13 @@ void Printer::Print(const map<string, string>& variables, const char* text) {
+ }
+
+ void Printer::Print(const char* text) {
+- static map<string, string> empty;
++ static std::map<string, string> empty;
+ Print(empty, text);
+ }
+
+ void Printer::Print(const char* text,
+ const char* variable, const string& value) {
+- map<string, string> vars;
++ std::map<string, string> vars;
+ vars[variable] = value;
+ Print(vars, text);
+ }
+@@ -126,7 +126,7 @@ void Printer::Print(const char* text,
+ void Printer::Print(const char* text,
+ const char* variable1, const string& value1,
+ const char* variable2, const string& value2) {
+- map<string, string> vars;
++ std::map<string, string> vars;
+ vars[variable1] = value1;
+ vars[variable2] = value2;
+ Print(vars, text);
+--
+1.6.6
+
Deleted: csw/mgar/pkg/protobuf/trunk/files/std-map-2.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/std-map-2.patch 2010-02-23 07:37:33 UTC (rev 8753)
+++ csw/mgar/pkg/protobuf/trunk/files/std-map-2.patch 2010-02-23 07:41:51 UTC (rev 8754)
@@ -1,11 +0,0 @@
---- protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface.h.orig 2010-02-20 19:04:19.471295716 +0100
-+++ protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface.h 2010-02-20 19:05:14.390216481 +0100
-@@ -55,6 +55,8 @@
-
- namespace compiler {
-
-+using std::map;
-+
- class CodeGenerator; // code_generator.h
- class OutputDirectory; // code_generator.h
- class DiskSourceTree; // importer.h
Deleted: csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch 2010-02-23 07:37:33 UTC (rev 8753)
+++ csw/mgar/pkg/protobuf/trunk/files/std-map-again.patch 2010-02-23 07:41:51 UTC (rev 8754)
@@ -1,11 +0,0 @@
---- protobuf-2.3.0/src/google/protobuf/descriptor_database.h.orig 2010-02-20 23:33:10.978002985 +0100
-+++ protobuf-2.3.0/src/google/protobuf/descriptor_database.h 2010-02-20 23:33:21.265334100 +0100
-@@ -233,7 +233,7 @@
-
- // Find the last entry in the by_symbol_ map whose key is less than or
- // equal to the given name.
-- typename map<string, Value>::iterator FindLastLessOrEqual(
-+ typename std::map<string, Value>::iterator FindLastLessOrEqual(
- const string& name);
-
- // True if either the arguments are equal or super_symbol identifies a
Deleted: csw/mgar/pkg/protobuf/trunk/files/std-map-in-google-protobuf-extension_set.cc.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/std-map-in-google-protobuf-extension_set.cc.patch 2010-02-23 07:37:33 UTC (rev 8753)
+++ csw/mgar/pkg/protobuf/trunk/files/std-map-in-google-protobuf-extension_set.cc.patch 2010-02-23 07:41:51 UTC (rev 8754)
@@ -1,243 +0,0 @@
-From 69fe78fbe6c50a69eb57d20538e78d73d2abab4a Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Sat, 20 Feb 2010 15:36:34 +0100
-Subject: [PATCH] std::map in google/protobuf/extension_set.cc
-
----
- src/google/protobuf/extension_set.cc | 52 +++++++++++++++++-----------------
- 1 files changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc
-index 6084885..2cd66f6 100644
---- a/src/google/protobuf/extension_set.cc
-+++ b/src/google/protobuf/extension_set.cc
-@@ -162,7 +162,7 @@ void ExtensionSet::RegisterMessageExtension(const MessageLite* containing_type,
- ExtensionSet::ExtensionSet() {}
-
- ExtensionSet::~ExtensionSet() {
-- for (map<int, Extension>::iterator iter = extensions_.begin();
-+ for (std::map<int, Extension>::iterator iter = extensions_.begin();
- iter != extensions_.end(); ++iter) {
- iter->second.Free();
- }
-@@ -174,20 +174,20 @@ ExtensionSet::~ExtensionSet() {
- // vector<const FieldDescriptor*>* output) const
-
- bool ExtensionSet::Has(int number) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- if (iter == extensions_.end()) return false;
- GOOGLE_DCHECK(!iter->second.is_repeated);
- return !iter->second.is_cleared;
- }
-
- int ExtensionSet::ExtensionSize(int number) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- if (iter == extensions_.end()) return false;
- return iter->second.GetSize();
- }
-
- void ExtensionSet::ClearExtension(int number) {
-- map<int, Extension>::iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::iterator iter = extensions_.find(number);
- if (iter == extensions_.end()) return;
- iter->second.Clear();
- }
-@@ -215,7 +215,7 @@ enum Cardinality {
- \
- LOWERCASE ExtensionSet::Get##CAMELCASE(int number, \
- LOWERCASE default_value) const { \
-- map<int, Extension>::const_iterator iter = extensions_.find(number); \
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number); \
- if (iter == extensions_.end() || iter->second.is_cleared) { \
- return default_value; \
- } else { \
-@@ -240,7 +240,7 @@ void ExtensionSet::Set##CAMELCASE(int number, FieldType type, \
- } \
- \
- LOWERCASE ExtensionSet::GetRepeated##CAMELCASE(int number, int index) const { \
-- map<int, Extension>::const_iterator iter = extensions_.find(number); \
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number); \
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; \
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, UPPERCASE); \
- return iter->second.repeated_##LOWERCASE##_value->Get(index); \
-@@ -248,7 +248,7 @@ LOWERCASE ExtensionSet::GetRepeated##CAMELCASE(int number, int index) const { \
- \
- void ExtensionSet::SetRepeated##CAMELCASE( \
- int number, int index, LOWERCASE value) { \
-- map<int, Extension>::iterator iter = extensions_.find(number); \
-+ std::map<int, Extension>::iterator iter = extensions_.find(number); \
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; \
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, UPPERCASE); \
- iter->second.repeated_##LOWERCASE##_value->Set(index, value); \
-@@ -285,7 +285,7 @@ PRIMITIVE_ACCESSORS( BOOL, bool, Bool)
- // Enums
-
- int ExtensionSet::GetEnum(int number, int default_value) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- if (iter == extensions_.end() || iter->second.is_cleared) {
- // Not present. Return the default value.
- return default_value;
-@@ -310,14 +310,14 @@ void ExtensionSet::SetEnum(int number, FieldType type, int value,
- }
-
- int ExtensionSet::GetRepeatedEnum(int number, int index) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, ENUM);
- return iter->second.repeated_enum_value->Get(index);
- }
-
- void ExtensionSet::SetRepeatedEnum(int number, int index, int value) {
-- map<int, Extension>::iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, ENUM);
- iter->second.repeated_enum_value->Set(index, value);
-@@ -345,7 +345,7 @@ void ExtensionSet::AddEnum(int number, FieldType type,
-
- const string& ExtensionSet::GetString(int number,
- const string& default_value) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- if (iter == extensions_.end() || iter->second.is_cleared) {
- // Not present. Return the default value.
- return default_value;
-@@ -371,14 +371,14 @@ string* ExtensionSet::MutableString(int number, FieldType type,
- }
-
- const string& ExtensionSet::GetRepeatedString(int number, int index) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, STRING);
- return iter->second.repeated_string_value->Get(index);
- }
-
- string* ExtensionSet::MutableRepeatedString(int number, int index) {
-- map<int, Extension>::iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, STRING);
- return iter->second.repeated_string_value->Mutable(index);
-@@ -404,7 +404,7 @@ string* ExtensionSet::AddString(int number, FieldType type,
-
- const MessageLite& ExtensionSet::GetMessage(
- int number, const MessageLite& default_value) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- if (iter == extensions_.end()) {
- // Not present. Return the default value.
- return default_value;
-@@ -442,14 +442,14 @@ MessageLite* ExtensionSet::MutableMessage(int number, FieldType type,
-
- const MessageLite& ExtensionSet::GetRepeatedMessage(
- int number, int index) const {
-- map<int, Extension>::const_iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::const_iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, MESSAGE);
- return iter->second.repeated_message_value->Get(index);
- }
-
- MessageLite* ExtensionSet::MutableRepeatedMessage(int number, int index) {
-- map<int, Extension>::iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
- GOOGLE_DCHECK_TYPE(iter->second, REPEATED, MESSAGE);
- return iter->second.repeated_message_value->Mutable(index);
-@@ -488,7 +488,7 @@ MessageLite* ExtensionSet::AddMessage(int number, FieldType type,
- #undef GOOGLE_DCHECK_TYPE
-
- void ExtensionSet::RemoveLast(int number) {
-- map<int, Extension>::iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
-
- Extension* extension = &iter->second;
-@@ -529,7 +529,7 @@ void ExtensionSet::RemoveLast(int number) {
- }
-
- void ExtensionSet::SwapElements(int number, int index1, int index2) {
-- map<int, Extension>::iterator iter = extensions_.find(number);
-+ std::map<int, Extension>::iterator iter = extensions_.find(number);
- GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty).";
-
- Extension* extension = &iter->second;
-@@ -572,14 +572,14 @@ void ExtensionSet::SwapElements(int number, int index1, int index2) {
- // ===================================================================
-
- void ExtensionSet::Clear() {
-- for (map<int, Extension>::iterator iter = extensions_.begin();
-+ for (std::map<int, Extension>::iterator iter = extensions_.begin();
- iter != extensions_.end(); ++iter) {
- iter->second.Clear();
- }
- }
-
- void ExtensionSet::MergeFrom(const ExtensionSet& other) {
-- for (map<int, Extension>::const_iterator iter = other.extensions_.begin();
-+ for (std::map<int, Extension>::const_iterator iter = other.extensions_.begin();
- iter != other.extensions_.end(); ++iter) {
- const Extension& other_extension = iter->second;
-
-@@ -682,7 +682,7 @@ void ExtensionSet::Swap(ExtensionSet* x) {
- bool ExtensionSet::IsInitialized() const {
- // Extensions are never required. However, we need to check that all
- // embedded messages are initialized.
-- for (map<int, Extension>::const_iterator iter = extensions_.begin();
-+ for (std::map<int, Extension>::const_iterator iter = extensions_.begin();
- iter != extensions_.end(); ++iter) {
- const Extension& extension = iter->second;
- if (cpp_type(extension.type) == WireFormatLite::CPPTYPE_MESSAGE) {
-@@ -1001,7 +1001,7 @@ bool ExtensionSet::ParseMessageSetItem(io::CodedInputStream* input,
- void ExtensionSet::SerializeWithCachedSizes(
- int start_field_number, int end_field_number,
- io::CodedOutputStream* output) const {
-- map<int, Extension>::const_iterator iter;
-+ std::map<int, Extension>::const_iterator iter;
- for (iter = extensions_.lower_bound(start_field_number);
- iter != extensions_.end() && iter->first < end_field_number;
- ++iter) {
-@@ -1011,7 +1011,7 @@ void ExtensionSet::SerializeWithCachedSizes(
-
- void ExtensionSet::SerializeMessageSetWithCachedSizes(
- io::CodedOutputStream* output) const {
-- map<int, Extension>::const_iterator iter;
-+ std::map<int, Extension>::const_iterator iter;
- for (iter = extensions_.begin(); iter != extensions_.end(); ++iter) {
- iter->second.SerializeMessageSetItemWithCachedSizes(iter->first, output);
- }
-@@ -1020,7 +1020,7 @@ void ExtensionSet::SerializeMessageSetWithCachedSizes(
- int ExtensionSet::ByteSize() const {
- int total_size = 0;
-
-- for (map<int, Extension>::const_iterator iter = extensions_.begin();
-+ for (std::map<int, Extension>::const_iterator iter = extensions_.begin();
- iter != extensions_.end(); ++iter) {
- total_size += iter->second.ByteSize(iter->first);
- }
-@@ -1031,7 +1031,7 @@ int ExtensionSet::ByteSize() const {
- int ExtensionSet::MessageSetByteSize() const {
- int total_size = 0;
-
-- for (map<int, Extension>::const_iterator iter = extensions_.begin();
-+ for (std::map<int, Extension>::const_iterator iter = extensions_.begin();
- iter != extensions_.end(); ++iter) {
- total_size += iter->second.MessageSetItemByteSize(iter->first);
- }
-@@ -1045,7 +1045,7 @@ int ExtensionSet::MessageSetByteSize() const {
- bool ExtensionSet::MaybeNewExtension(int number,
- const FieldDescriptor* descriptor,
- Extension** result) {
-- pair<map<int, Extension>::iterator, bool> insert_result =
-+ pair<std::map<int, Extension>::iterator, bool> insert_result =
- extensions_.insert(make_pair(number, Extension()));
- *result = &insert_result.first->second;
- (*result)->descriptor = descriptor;
---
-1.6.6
-
Deleted: csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch 2010-02-23 07:37:33 UTC (rev 8753)
+++ csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again-include-map.patch 2010-02-23 07:41:51 UTC (rev 8754)
@@ -1,10 +0,0 @@
---- protobuf-2.3.0/src/google/protobuf/descriptor_database.cc.orig 2010-02-20 23:39:07.835347049 +0100
-+++ protobuf-2.3.0/src/google/protobuf/descriptor_database.cc 2010-02-20 23:43:55.328201640 +0100
-@@ -35,6 +35,7 @@
- #include <google/protobuf/descriptor_database.h>
-
- #include <set>
-+#include <map>
-
- #include <google/protobuf/descriptor.pb.h>
- #include <google/protobuf/wire_format_lite_inl.h>
Deleted: csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch 2010-02-23 07:37:33 UTC (rev 8753)
+++ csw/mgar/pkg/protobuf/trunk/files/std-map-yet-again.patch 2010-02-23 07:41:51 UTC (rev 8754)
@@ -1,38 +0,0 @@
---- protobuf-2.3.0/src/google/protobuf/descriptor_database.cc.orig 2010-02-20 23:39:07.835347049 +0100
-+++ protobuf-2.3.0/src/google/protobuf/descriptor_database.cc 2010-02-20 23:39:49.843758591 +0100
-@@ -97,7 +97,7 @@
-
- // Try to look up the symbol to make sure a super-symbol doesn't already
- // exist.
-- typename map<string, Value>::iterator iter = FindLastLessOrEqual(name);
-+ typename std::map<string, Value>::iterator iter = FindLastLessOrEqual(name);
-
- if (iter == by_symbol_.end()) {
- // Apparently the map is currently empty. Just insert and be done with it.
-@@ -179,7 +179,7 @@
- template <typename Value>
- Value SimpleDescriptorDatabase::DescriptorIndex<Value>::FindSymbol(
- const string& name) {
-- typename map<string, Value>::iterator iter = FindLastLessOrEqual(name);
-+ typename std::map<string, Value>::iterator iter = FindLastLessOrEqual(name);
-
- return (iter != by_symbol_.end() && IsSubSymbol(iter->first, name)) ?
- iter->second : Value();
-@@ -198,7 +198,7 @@
- bool SimpleDescriptorDatabase::DescriptorIndex<Value>::FindAllExtensionNumbers(
- const string& containing_type,
- vector<int>* output) {
-- typename map<pair<string, int>, Value >::const_iterator it =
-+ typename std::map<pair<string, int>, Value >::const_iterator it =
- by_extension_.lower_bound(make_pair(containing_type, 0));
- bool success = false;
-
-@@ -212,7 +212,7 @@
- }
-
- template <typename Value>
--typename map<string, Value>::iterator
-+typename std::map<string, Value>::iterator
- SimpleDescriptorDatabase::DescriptorIndex<Value>::FindLastLessOrEqual(
- const string& name) {
- // Find the last key in the map which sorts less than or equal to the
Deleted: csw/mgar/pkg/protobuf/trunk/files/stdint-and-ddi.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/stdint-and-ddi.patch 2010-02-23 07:37:33 UTC (rev 8753)
+++ csw/mgar/pkg/protobuf/trunk/files/stdint-and-ddi.patch 2010-02-23 07:41:51 UTC (rev 8754)
@@ -1,22 +0,0 @@
-diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
-index 551ee4a..d0ba7d5 100644
---- a/src/google/protobuf/stubs/common.h
-+++ b/src/google/protobuf/stubs/common.h
-@@ -40,13 +40,16 @@
- #include <cstddef>
- #include <string>
- #include <string.h>
--#if defined(__osf__)
-+#if defined(__osf__) || defined(__SUNPRO_CC)
- // Tru64 lacks stdint.h, but has inttypes.h which defines a superset of
- // what stdint.h would define.
- #include <inttypes.h>
- #elif !defined(_MSC_VER)
- #include <stdint.h>
- #endif
-+#if defined(__SUNPRO_CC)
-+#include <sys/ddi.h>
-+#endif
-
- namespace std {}
-
Deleted: csw/mgar/pkg/protobuf/trunk/files/stdint-gcc.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/stdint-gcc.patch 2010-02-23 07:37:33 UTC (rev 8753)
+++ csw/mgar/pkg/protobuf/trunk/files/stdint-gcc.patch 2010-02-23 07:41:51 UTC (rev 8754)
@@ -1,19 +0,0 @@
---- protobuf-2.3.0/src/google/protobuf/stubs/common.h.orig 2010-02-20 19:43:54.828914057 +0100
-+++ protobuf-2.3.0/src/google/protobuf/stubs/common.h 2010-02-20 19:44:12.015263840 +0100
-@@ -40,14 +40,14 @@
- #include <cstddef>
- #include <string>
- #include <string.h>
--#if defined(__osf__) || defined(__SUNPRO_CC)
-+#if defined(__osf__) || defined(__SUNPRO_CC) || defined(__sun__)
- // Tru64 lacks stdint.h, but has inttypes.h which defines a superset of
- // what stdint.h would define.
- #include <inttypes.h>
- #elif !defined(_MSC_VER)
- #include <stdint.h>
- #endif
--#if defined(__SUNPRO_CC)
-+#if defined(__SUNPRO_CC) || defined(__sun__)
- #include <sys/ddi.h>
- #endif
-
Deleted: csw/mgar/pkg/protobuf/trunk/files/strtof.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/strtof.patch 2010-02-23 07:37:33 UTC (rev 8753)
+++ csw/mgar/pkg/protobuf/trunk/files/strtof.patch 2010-02-23 07:41:51 UTC (rev 8754)
@@ -1,13 +0,0 @@
---- protobuf-2.3.0/src/google/protobuf/stubs/strutil.h.orig 2010-02-20 23:30:45.020320818 +0100
-+++ protobuf-2.3.0/src/google/protobuf/stubs/strutil.h 2010-02-20 23:31:46.345602745 +0100
-@@ -37,6 +37,10 @@
- #include <vector>
- #include <google/protobuf/stubs/common.h>
-
-+#if defined(__SUNPRO_CC)
-+#define strtof strtod
-+#endif
-+
- namespace google {
- namespace protobuf {
-
Deleted: csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch 2010-02-23 07:37:33 UTC (rev 8753)
+++ csw/mgar/pkg/protobuf/trunk/files/vector-in-repeated_field.h.patch 2010-02-23 07:41:51 UTC (rev 8754)
@@ -1,10 +0,0 @@
---- protobuf-2.3.0/src/google/protobuf/repeated_field.h.orig 2010-02-20 23:27:43.399507660 +0100
-+++ protobuf-2.3.0/src/google/protobuf/repeated_field.h 2010-02-20 23:27:56.747055871 +0100
-@@ -48,6 +48,7 @@
-
- #include <string>
- #include <iterator>
-+#include <vector>
- #include <google/protobuf/stubs/common.h>
- #include <google/protobuf/message_lite.h>
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list