[csw-devel] SF.net SVN: gar:[17952] csw/mgar/pkg/libpqxx/trunk

[wahwah at users.sourceforge.net]

Revision: 17952
          http://gar.svn.sourceforge.net/gar/?rev=17952&view=rev
Author:   wahwah
Date:     2012-05-06 07:21:00 +0000 (Sun, 06 May 2012)
Log Message:
-----------
libpqxx/trunk: Const iterator issues: Solaris Studio doesn't allow to create a const_iterator from a normal iterator.

Modified Paths:
--------------
    csw/mgar/pkg/libpqxx/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/libpqxx/trunk/files/0001-Can-t-instantiate-a-const_reverse_iterator.patch

Modified: csw/mgar/pkg/libpqxx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpqxx/trunk/Makefile	2012-05-06 07:11:22 UTC (rev 17951)
+++ csw/mgar/pkg/libpqxx/trunk/Makefile	2012-05-06 07:21:00 UTC (rev 17952)
@@ -15,6 +15,8 @@
 
 BUILD_DEP_PKGS = CSWpostgresql-dev
 
+PATCHFILES += 0001-Can-t-instantiate-a-const_reverse_iterator.patch
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Added: csw/mgar/pkg/libpqxx/trunk/files/0001-Can-t-instantiate-a-const_reverse_iterator.patch
===================================================================
--- csw/mgar/pkg/libpqxx/trunk/files/0001-Can-t-instantiate-a-const_reverse_iterator.patch	                        (rev 0)
+++ csw/mgar/pkg/libpqxx/trunk/files/0001-Can-t-instantiate-a-const_reverse_iterator.patch	2012-05-06 07:21:00 UTC (rev 17952)
@@ -0,0 +1,43 @@
+From 6952ec8d9a19c0972d8358da98eb48e5fbaa4563 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 6 May 2012 09:17:46 +0200
+Subject: [PATCH] Can't instantiate a const_reverse_iterator
+
+---
+ src/connection_base.cxx |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/connection_base.cxx b/src/connection_base.cxx
+index e67643d..0573105 100644
+--- a/src/connection_base.cxx
++++ b/src/connection_base.cxx
+@@ -476,11 +476,11 @@ bool pqxx::connection_base::is_open() const throw ()
+ void pqxx::connection_base::process_notice_raw(const char msg[]) throw ()
+ {
+   if (!msg || !*msg) return;
+-  const list<errorhandler *>::const_reverse_iterator
++  list<errorhandler *>::reverse_iterator
+ 	rbegin = m_errorhandlers.rbegin(),
+ 	rend = m_errorhandlers.rend();
+   for (
+-	list<errorhandler *>::const_reverse_iterator i = rbegin;
++	list<errorhandler *>::reverse_iterator i = rbegin;
+ 	i != rend && (**i)(msg);
+ 	++i) ;
+ }
+@@ -997,10 +997,10 @@ void pqxx::connection_base::close() throw ()
+     PQsetNoticeProcessor(m_Conn, NULL, NULL);
+     list<errorhandler *> old_handlers;
+     m_errorhandlers.swap(old_handlers);
+-    const list<errorhandler *>::const_reverse_iterator
++    const list<errorhandler *>::reverse_iterator
+ 	rbegin = old_handlers.rbegin(),
+ 	rend = old_handlers.rend();
+-    for (list<errorhandler *>::const_reverse_iterator i = rbegin; i!=rend; ++i)
++    for (list<errorhandler *>::reverse_iterator i = rbegin; i!=rend; ++i)
+       gate::errorhandler_connection_base(**i).unregister();
+ 
+     m_Conn = m_policy.do_disconnect(m_Conn);
+-- 
+1.7.10
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.