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

[Paul J. Lucas]

1. Added operator<< for SchemaTypeCode to (a) print it better and (b) eliminate warning.
2. Eliminated a few other warnings as well.

1. Added operator<< for SchemaTypeCode to (a) print it better and (b) eliminate warning.
2. Eliminated a few other warnings as well.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2012-12-05T04-55-07.832Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job pjl-misc-2012-12-05T04-55-07.832Z is finished. The
  final status was:

  4 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2012-12-05T15-06-05.62Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job pjl-misc-2012-12-05T15-06-05.62Z is finished. The
  final status was:

  4 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Paul J. Lucas (paul-lucas)]

Chris claims the RQ is fixed now.

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

11004. By Paul J. Lucas on 2012-12-07

Merge from trunk.

11005. By Paul J. Lucas on 2012-12-08

Fix of MSVC++ 4800 warning.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2012-12-11T19-57-11.912Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2012-12-11T19-57-11.912Z is finished. The final status was:

All tests succeeded!

=== modified file 'include/zorba/internal/ztd.h'
--- include/zorba/internal/ztd.h	2012-09-19 21:16:15 +0000
+++ include/zorba/internal/ztd.h	2012-12-08 00:11:21 +0000
@@ -84,7 +84,7 @@
  * \internal
  * This namespace is used only to bundle the implementation details for
  * implementing \c has_insertion_operator<T>.
- * This implementation is based on http://stackoverflow.com/questions/4434569/
+ * This implementation is based on http://stackoverflow.com/q/4434569/
  */
 namespace has_insertion_operator_impl {
   typedef char no;
@@ -410,12 +410,20 @@
   }
 
   /**
-   * Converts the the built-in \c bool value to an explicit \c bool value.
+   * Converts the given value to an explicit \c bool value.
    *
-   * @param value The \c bool value to convert.
+   * @tparam T The type of the value to convert.
+   * @param value The value to convert.
    * @return Return said value.
    */
-  static type value_of( bool value ) {
+  template<typename T> static
+  typename std::enable_if<ZORBA_TR1_NS::is_convertible<T,bool>::value,
+                          type>::type
+  value_of( T const &value ) {
+    //
+    // Using a template here eliminates a MSVC++ 4800 warning:
+    // "forcing value to 'true' or 'false' (performance warning)"
+    //
     return value ? true_value() : false_value();
   }
 };

=== modified file 'include/zorba/store_consts.h'
--- include/zorba/store_consts.h	2012-09-19 21:16:15 +0000
+++ include/zorba/store_consts.h	2012-12-08 00:11:21 +0000
@@ -16,6 +16,7 @@
 #ifndef ZORBA_STORE_STORE_CONSTS_H
 #define ZORBA_STORE_STORE_CONSTS_H
 
+#include <iostream>
 #include <string>
 #include <zorba/config.h>
 
@@ -89,6 +90,8 @@
   XS_LAST
 };
 
+std::ostream& operator<<( std::ostream&, SchemaTypeCode );
+
 
 class ZORBA_DLL_PUBLIC StoreConsts
 {

=== modified file 'src/api/CMakeLists.txt'
--- src/api/CMakeLists.txt	2012-10-08 12:09:36 +0000
+++ src/api/CMakeLists.txt	2012-12-08 00:11:21 +0000
@@ -57,6 +57,7 @@
     zorba_functions.cpp
     annotationimpl.cpp
     auditimpl.cpp
+    store_consts.cpp
     streambuf.cpp
     transcode_streambuf.cpp
     uuid.cpp

=== added file 'src/api/store_consts.cpp'
--- src/api/store_consts.cpp	1970-01-01 00:00:00 +0000
+++ src/api/store_consts.cpp	2012-12-08 00:11:21 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2006-2008 The FLWOR Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <zorba/store_consts.h>
+
+namespace zorba {
+namespace store {
+
+///////////////////////////////////////////////////////////////////////////////
+
+std::ostream& operator<<( std::ostream &o, SchemaTypeCode c ) {
+  static char const *const s[] = {
+    "xs:anyAtomicType",       // 0
+    "xs:string",              // 1
+    "xs:normalizedString",    // 2
+    "xs:token",               // 3
+    "xs:language",            // 4
+    "xs:NMTOKEN",             // 5
+    "xs:Name",                // 6
+    "xs:NCName",              // 7
+    "xs:ID",                  // 8
+    "xs:IDREF",               // 9
+    "xs:ENTITY",              // 10
+    "xs:untypedAtomic",       // 11
+    "xs:dateTime",            // 12
+    "xs:date",                // 13
+    "xs:time",                // 14
+    "xs:duration",            // 15
+    "xs:dayTimeDuration",     // 16
+    "xs:yearMonthDuration",   // 17
+    "xs:float",               // 18
+    "xs:double",              // 19
+    "xs:decimal",             // 20
+    "xs:integer",             // 21
+    "xs:nonPositiveInteger",  // 22
+    "xs:negativeInteger",     // 23
+    "xs:long",                // 24
+    "xs:int",                 // 25
+    "xs:short",               // 26
+    "xs:byte",                // 27
+    "xs:nonNegativeInteger",  // 28
+    "xs:unsignedLong",        // 29
+    "xs:unsignedInt",         // 30
+    "xs:unsignedShort",       // 31
+    "xs:unsignedByte",        // 32
+    "xs:positiveInteger",     // 33
+    "xs:gYearMonth",          // 34
+    "xs:gYear",               // 35
+    "xs:gMonthDay",           // 36
+    "xs:gDay",                // 37
+    "xs:gMonth",              // 38
+    "xs:boolean",             // 39
+    "xs:base64Binary",        // 40
+    "xs:hexBinary",           // 41
+    "xs:anyURI",              // 42
+    "xs:QNAME",               // 43
+    "xs:NOTATION",            // 44
+    "js:null",                // 45
+  };
+
+  if ( c >= 0 && c < XS_LAST )
+    o << s[ c ];
+  else
+    o << "[illegal type code: " << (int)c << ']';
+
+  return o;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+} // namespace store
+} // namespace zorba
+
+/* vim:set et sw=2 ts=2: */

=== added file 'src/diagnostics/dict_zed_keys_h.xq'
--- src/diagnostics/dict_zed_keys_h.xq	1970-01-01 00:00:00 +0000
+++ src/diagnostics/dict_zed_keys_h.xq	2012-12-08 00:11:21 +0000
@@ -0,0 +1,55 @@
+(:
+ : Copyright 2006-2009 The FLWOR Foundation.
+ :
+ : Licensed under the Apache License, Version 2.0 (the "License");
+ : you may not use this file except in compliance with the License.
+ : You may obtain a copy of the License at
+ :
+ : http://www.apache.org/licenses/LICENSE-2.0
+ :
+ : Unless required by applicable law or agreed to in writing, software
+ : distributed under the License is distributed on an "AS IS" BASIS,
+ : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ : See the License for the specific language governing permissions and
+ : limitations under the License.
+:)
+
+import module namespace util = "http://www.zorba-xquery.com/diagnostic/util" at "diagnostic_util.xq";
+
+declare function local:make-zed-defines( $doc ) as xs:string*
+{
+  for $entry in ( $doc//entry )
+  let $key := $entry/@key
+  return
+    if ( contains( $key, ' ' ) )
+    then ()
+    else
+      let $full_key := 
+        if ( $entry/parent::diagnostic )
+        then concat( $entry/parent::diagnostic/@code, "_", $key )
+        else $key
+      return concat( "#define ZED_", $full_key, ' "~', $full_key, '"' )
+};
+
+declare variable $input external;
+
+string-join(
+  ( util:copyright(), 
+    '#ifndef ZORBA_DIAGNOSTICS_ZED_KEYS',
+    '#define ZORBA_DIAGNOSTICS_ZED_KEYS',
+    '',
+    local:make-zed-defines( $input ),
+    '',
+    '#endif /* ZORBA_DIAGNOSTICS_ZED_KEYS */',
+    '/*',
+    ' * Local variables:',
+    ' * mode: c++',
+    ' * End:',
+    ' */',
+    '/* vim:set et sw=2 ts=2: */'
+  ),
+  $util:newline
+),
+$util:newline
+
+(: vim:set syntax=xquery et sw=2 ts=2: :)

=== removed file 'src/diagnostics/dict_zed_keys_h.xq'
--- src/diagnostics/dict_zed_keys_h.xq	2012-09-18 02:14:50 +0000
+++ src/diagnostics/dict_zed_keys_h.xq	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-(:
- : Copyright 2006-2009 The FLWOR Foundation.
- :
- : Licensed under the Apache License, Version 2.0 (the "License");
- : you may not use this file except in compliance with the License.
- : You may obtain a copy of the License at
- :
- : http://www.apache.org/licenses/LICENSE-2.0
- :
- : Unless required by applicable law or agreed to in writing, software
- : distributed under the License is distributed on an "AS IS" BASIS,
- : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- : See the License for the specific language governing permissions and
- : limitations under the License.
-:)
-
-import module namespace util = "http://www.zorba-xquery.com/diagnostic/util" at "diagnostic_util.xq";
-
-declare function local:make-zed-defines( $doc ) as xs:string*
-{
-  for $entry in ( $doc//entry )
-  let $key := $entry/@key
-  return
-    if ( contains( $key, ' ' ) )
-    then ()
-    else
-      let $full_key := 
-        if ( $entry/parent::diagnostic )
-        then concat( $entry/parent::diagnostic/@code, "_", $key )
-        else $key
-      return concat( "#define ZED_", $full_key, ' "~', $full_key, '"' )
-};
-
-declare variable $input external;
-
-string-join(
-  ( util:copyright(), 
-    '#ifndef ZORBA_DIAGNOSTICS_ZED_KEYS',
-    '#define ZORBA_DIAGNOSTICS_ZED_KEYS',
-    '',
-    local:make-zed-defines( $input ),
-    '',
-    '#endif /* ZORBA_DIAGNOSTICS_ZED_KEYS */',
-    '/*',
-    ' * Local variables:',
-    ' * mode: c++',
-    ' * End:',
-    ' */',
-    '/* vim:set et sw=2 ts=2: */'
-  ),
-  $util:newline
-),
-$util:newline
-
-(: vim:set syntax=xquery et sw=2 ts=2: :)

=== modified file 'src/unit_tests/test_unordered_map.cpp'
--- src/unit_tests/test_unordered_map.cpp	2012-06-26 01:08:10 +0000
+++ src/unit_tests/test_unordered_map.cpp	2012-12-08 00:11:21 +0000
@@ -194,8 +194,9 @@
 }
 
 static void test_rehash() {
-  unordered_map<int,int> m;
-  unordered_map<int,int>::size_type const initial_buckets = m.bucket_count();
+  typedef unordered_map<int,int> map_type;
+  map_type m;
+  map_type::size_type const initial_buckets = m.bucket_count();
 
   // Add elements until bucket_count() changes which implies a rehash was done.
   for ( int i = 0; m.bucket_count() == initial_buckets; ++i )
@@ -204,8 +205,7 @@
   ASSERT_TRUE( m.bucket_count() > initial_buckets );
 
   // Ensure all the elements are still there.
-  unordered_map<int,int>::size_type const size = m.size();
-  for ( int i = 0; i < size; ++i )
+  for ( int i = 0; (unsigned)i < m.size(); ++i )
     ASSERT_TRUE_AND_NO_EXCEPTION( m.at( i ) == i );
 }
 

=== modified file 'src/unit_tests/test_unordered_set.cpp'
--- src/unit_tests/test_unordered_set.cpp	2012-06-26 01:08:10 +0000
+++ src/unit_tests/test_unordered_set.cpp	2012-12-08 00:11:21 +0000
@@ -38,12 +38,6 @@
   return result;
 }
 
-static void print_exception( char const *expr, int line,
-                             std::exception const &e ) {
-  assert_true( expr, line, false );
-  cout << "+ exception: " << e.what() << endl;
-}
-
 #define ASSERT_TRUE( EXPR ) assert_true( #EXPR, __LINE__, !!(EXPR) )
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -168,10 +162,11 @@
 }
 
 static void test_rehash() {
-  unordered_set<int> set;
-  unordered_set<int>::const_iterator i;
+  typedef unordered_set<int> set_type;
+  set_type set;
+  set_type::const_iterator i;
 
-  unordered_set<int>::size_type const initial_buckets = set.bucket_count();
+  set_type::size_type const initial_buckets = set.bucket_count();
 
   // Add elements until bucket_count() changes which implies a rehash was done.
   for ( int n = 0; set.bucket_count() == initial_buckets; ++n )
@@ -180,11 +175,9 @@
   ASSERT_TRUE( set.bucket_count() > initial_buckets );
 
   // Ensure all the elements are still there.
-  unordered_set<int>::size_type const size = set.size();
-  for ( int n = 0; n < size; ++n ) {
+  for ( int n = 0; (unsigned)n < set.size(); ++n )
     if ( ASSERT_TRUE( (i = set.find( n )) != set.end() ) )
       ASSERT_TRUE( *i == n );
-  }
 }
 
 static void test_swap() {

=== modified file 'src/util/stl_util.h'
--- src/util/stl_util.h	2012-11-29 03:48:40 +0000
+++ src/util/stl_util.h	2012-12-08 00:11:21 +0000
@@ -365,7 +365,7 @@
 // warning-free.
 //
 // Note: the use of "!!" is to work around a compiler problem on Windows;
-// see: http://stackoverflow.com/questions/9285657/sfinae-differentiation-between-signed-and-unsigned
+// see http://stackoverflow.com/q/9285657
 //
 
 template<typename N1,typename N2> inline

=== modified file 'src/util/string_util.h'
--- src/util/string_util.h	2012-09-19 21:16:15 +0000
+++ src/util/string_util.h	2012-12-08 00:11:21 +0000
@@ -46,8 +46,8 @@
  * the resultant string to some function.  See the BUILD_STRING macro for usage.
  * Note that you can use either "<<" or "," to taste.
  *
- * See http://stackoverflow.com/questions/5666678/ as to why a class like this
- * is needed rather than just using an ostringstream directly.
+ * See http://stackoverflow.com/q/5666678 as to why a class like this is
+ * needed rather than just using an ostringstream directly.
  */
 class string_builder {
 public: