Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.

Commit message:
Fixed escaping of $ and a comment.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/149845

Fixed escaping of $ and a comment.
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/149845
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2013-02-09 00:26:52 +0000
+++ src/diagnostics/diagnostic_en.xml	2013-02-21 14:34:23 +0000
@@ -3659,7 +3659,7 @@
     </entry>
 
     <entry key="NonClosedBackRef_3" if="!defined(ZORBA_NO_ICU)">
-      <value>'$$3': non-closed backreference</value>
+      <value>'\$$3': non-closed backreference</value>
     </entry>
 
     <entry key="NonFileThesaurusURI">
@@ -3671,7 +3671,7 @@
     </entry>
 
     <entry key="NonexistentBackRef_3" if="!defined(ZORBA_NO_ICU)">
-      <value>'$$3': non-existent backreference</value>
+      <value>'\$$3': non-existent backreference</value>
     </entry>
 
     <entry key="NotAllowedForTypeName">

=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp	2013-02-09 00:26:52 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp	2013-02-21 14:34:23 +0000
@@ -713,12 +713,12 @@
   { "~NodeIDNeedsBytes_2", "nodeid requires more than $2 bytes" },
   { "~NodeIDTooBig", "nodeid component too big for encoding" },
 #if !defined(ZORBA_NO_ICU)
-  { "~NonClosedBackRef_3", "'$$3': non-closed backreference" },
+  { "~NonClosedBackRef_3", "'\\$$3': non-closed backreference" },
 #endif
   { "~NonFileThesaurusURI", "non-file thesaurus URI" },
   { "~NonLocalhostAuthority", "non-localhost authority" },
 #if !defined(ZORBA_NO_ICU)
-  { "~NonexistentBackRef_3", "'$$3': non-existent backreference" },
+  { "~NonexistentBackRef_3", "'\\$$3': non-existent backreference" },
 #endif
   { "~NotAllowedForTypeName", "not allowed for typeName (use xsd:untyped instead)" },
   { "~NotAmongInScopeSchemaTypes", "not among in-scope schema types" },

=== modified file 'src/util/utf8_streambuf.h'
--- src/util/utf8_streambuf.h	2013-02-12 03:55:18 +0000
+++ src/util/utf8_streambuf.h	2013-02-21 14:34:23 +0000
@@ -194,7 +194,7 @@
  * and automatically detaches it when the %auto_attach object is destroyed.
  * \code
  *  void f( ostream &os ) {
- *    utf8::auto_attach<ostream> const raii( os, "ISO-8859-1" );
+ *    utf8::auto_attach<ostream> const raii( os );
  *    // ...
  *  }
  * \endcode

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to     : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Reply via email to