Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
1. Fixed typo: s/twelvth/twelfth/ -- fixed 3 FOTS failing tests.
2. Other misc. tweaks.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852
1. Fixed typo: s/twelvth/twelfth/ -- fixed 3 FOTS failing tests.
2. Other misc. tweaks.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/154852
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/durations_dates_times/format_dateTime.cpp'
--- src/runtime/durations_dates_times/format_dateTime.cpp 2013-03-20 15:35:21 +0000
+++ src/runtime/durations_dates_times/format_dateTime.cpp 2013-03-22 04:31:30 +0000
@@ -204,7 +204,7 @@
{ "nine", "ninth" },
{ "ten", "tenth" },
{ "eleven", "eleventh" },
- { "twelve", "twelveth" },
+ { "twelve", "twelfth" },
{ "thirteen", "thirteenth" },
{ "fourteen", "fourteenth" },
{ "fifteen", "fifteenth" },
=== modified file 'src/runtime/full_text/thesauri/wn_types.cpp'
--- src/runtime/full_text/thesauri/wn_types.cpp 2013-02-28 11:15:32 +0000
+++ src/runtime/full_text/thesauri/wn_types.cpp 2013-03-22 04:31:30 +0000
@@ -15,11 +15,14 @@
*/
#include "stdafx.h"
+// standard
#include <algorithm> /* for lower_bound */
+// Zorba
#include "util/less.h"
#include "diagnostics/assert.h"
+// local
#include "wn_types.h"
using namespace std;
=== modified file 'src/zorbautils/locale.cpp'
--- src/zorbautils/locale.cpp 2013-03-19 14:41:54 +0000
+++ src/zorbautils/locale.cpp 2013-03-22 04:31:30 +0000
@@ -15,6 +15,10 @@
*/
#include "stdafx.h"
+// standard
+#include <algorithm>
+#include <cstring>
+#include <stdexcept>
#ifdef WIN32
# include <windows.h>
# include "zorbautils/fatal.h"
@@ -25,13 +29,8 @@
# include <xlocale.h> /* for newlocale(3) */
#endif /* WIN32 */
-#include <algorithm>
-#include <cstring>
-#include <stdexcept>
-
+// Zorba
#include <zorba/internal/unique_ptr.h>
-
-// Zorba
#include "util/ascii_util.h"
#include "util/cxx_util.h"
#include "util/less.h"
--
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
