Author: hdu
Date: Wed Aug 14 13:25:05 2013
New Revision: 1513872
URL: http://svn.apache.org/r1513872
Log:
#i122208# allow silgraphite build with move-semantic enabled STL
by fixing the non-canonical copy constructor of gr::Segment()
Modified:
openoffice/branches/rejuvenate01/main/graphite/graphite-2.3.1.patch
Modified: openoffice/branches/rejuvenate01/main/graphite/graphite-2.3.1.patch
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/graphite/graphite-2.3.1.patch?rev=1513872&r1=1513871&r2=1513872&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/graphite/graphite-2.3.1.patch
(original)
+++ openoffice/branches/rejuvenate01/main/graphite/graphite-2.3.1.patch Wed Aug
14 13:25:05 2013
@@ -2360,6 +2360,17 @@
{
}
+--- misc/silgraphite-2.3.1/engine/include/graphite/Segment.h 2009-01-29
09:33:19.000000000 +0100
++++ misc/build/silgraphite-2.3.1/engine/include/graphite/Segment.h
2013-08-14 15:10:53.363864046 +0200
+@@ -64,7 +64,7 @@
+ virtual ~Segment();
+
+ // Basic copy constructor:
+- Segment(Segment & seg);
++ Segment( const Segment&);
+
+ // For making modified copies of segments:
+ static Segment * LineContextSegment(Segment & seg, bool fStartLine,
bool fEndLine);
--- misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp.bak
2010-06-23 19:59:54.611660400 +0700
+++ misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp
2010-06-23 21:30:16.335460400 +0700
@@ -246,6 +246,8 @@
@@ -2371,6 +2382,15 @@
// m_psstrm = NULL;
m_prgslout = NULL;
+@@ -435,7 +435,7 @@
+
/*----------------------------------------------------------------------------------------------
+ Basic copy method.
+
----------------------------------------------------------------------------------------------*/
+-Segment::Segment(Segment & seg)
++Segment::Segment( const Segment& seg)
+ {
+ int islout;
+
@@ -2988,9 +2988,10 @@
return kresOk;
}
