← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

 

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

Commit message:
Put utf8_string<T>::npos back the way it was to fix Windows build error.

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/156422

Put utf8_string<T>::npos back the way it was to fix Windows build error.
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/156422
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/util/utf8_string.h'
--- src/util/utf8_string.h	2013-03-27 23:05:59 +0000
+++ src/util/utf8_string.h	2013-04-01 21:02:31 +0000
@@ -225,7 +225,7 @@
   typedef typename string_traits_type::std_string_arg std_string_arg;
   typedef typename string_traits_type::str_return_type str_return_type;
 
-  static size_type const npos = StringType::npos;
+  static size_type const npos = static_cast<size_type>( -1 );
 
   ////////// constructors & destructor ////////////////////////////////////////
 


Follow ups