zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

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

Commit message:
Final (hopefully) set of fixes for Mac OS X Mavericks.

Requested reviews:
  Paul J. Lucas (paul-lucas)

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

Final (hopefully) set of fixes for Mac OS X Mavericks.
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'CMakeCompiler.txt'
--- CMakeCompiler.txt	2013-02-07 17:24:36 +0000
+++ CMakeCompiler.txt	2013-10-30 14:44:09 +0000
@@ -245,6 +245,12 @@
 IF (APPLE)
   # Needed for CFUUID*() functions in util/uuid.c.
   SET(CMAKE_SHARED_LINKER_FLAGS "-framework CoreFoundation ${CMAKE_SHARED_LINKER_FLAGS}")
+  # Due to the Zorba debugger (wrongly) relying on the C++11-only class of
+  # std::tuple, this is necessary.  Oddly, this fix seems to be necesssary only
+  # on Mac OS X Mavericks.
+  IF (CMAKE_COMPILER_IS_GNUCXX OR CLANG)
+    SET(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+  ENDIF (CMAKE_COMPILER_IS_GNUCXX OR CLANG)
 ELSEIF (WIN32)
   # Needed for UuidCreateSequential() function in util/uuid.c.
   SET(requiredlibs ${requiredlibs} "Rpcrt4")
@@ -262,3 +268,6 @@
     "required on Linux. On Ubuntu, the 'uuid-dev' package is required; "
     "look for similar packages on other platforms.")
 ENDIF (APPLE)
+
+
+# vim:set et sw=2 ts=2:

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-27 15:31:16 +0000
+++ CMakeLists.txt	2013-10-30 14:44:09 +0000
@@ -73,105 +73,6 @@
   SET_PROPERTY (GLOBAL PROPERTY USE_FOLDERS ON)
 ENDIF(ZORBA_USE_TARGET_FOLDERS)
 
-###############################################################################
-# Check for system include files, features, etc.
-###############################################################################
-INCLUDE(CheckCXXSourceCompiles)
-INCLUDE(CheckFunctionExists)
-INCLUDE(CheckIncludeFileCXX)
-INCLUDE(CheckIncludeFiles)
-INCLUDE(CheckLibraryExists)
-INCLUDE(CheckStructHasMember)
-INCLUDE(CheckSymbolExists)
-INCLUDE(CheckTypeSize)
-INCLUDE(CheckVariableExists)
-
-INCLUDE(TestBigEndian)
-TEST_BIG_ENDIAN( BIG_ENDIAN )
-IF (${BIG_ENDIAN})
-  SET( ZORBA_BIG_ENDIAN 1 )
-ELSE (${BIG_ENDIAN})
-  SET( ZORBA_LITTLE_ENDIAN 1 )
-ENDIF (${BIG_ENDIAN})
-
-CHECK_INCLUDE_FILES ("unicode/coll.h"               ZORBA_HAVE_COLL_H)
-CHECK_INCLUDE_FILES ("iconv.h"                      ZORBA_HAVE_ICONV_H)
-CHECK_INCLUDE_FILES ("inttypes.h"                   ZORBA_HAVE_INTTYPES_H)
-CHECK_INCLUDE_FILES ("limits.h"                     ZORBA_HAVE_LIMITS_H)
-CHECK_INCLUDE_FILES ("stdint.h"                     ZORBA_HAVE_STDINT_H)
-CHECK_INCLUDE_FILES ("stdlib.h"                     ZORBA_HAVE_STDLIB_H)
-CHECK_INCLUDE_FILES ("sys/param.h;sys/mount.h"      ZORBA_HAVE_SYS_MOUNT_H)
-CHECK_INCLUDE_FILES ("sys/types.h"                  ZORBA_HAVE_SYS_TYPES_H)
-CHECK_INCLUDE_FILES ("tzfile.h"                     ZORBA_HAVE_TZFILE_H)
-CHECK_INCLUDE_FILES ("unicode/ustring.h"            ZORBA_HAVE_USTRING_H)
-CHECK_INCLUDE_FILES ("unicode/utypes.h"             ZORBA_HAVE_UTYPES_H)
-
-IF (NOT APPLE OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.4")
-  # execinfo is found by this macro when cross compiling for Mac OS X 10.4
-  # although it shouldn't be found for this platform
-  CHECK_INCLUDE_FILES ("execinfo.h"                   ZORBA_HAVE_EXECINFO_H)
-ENDIF (NOT APPLE OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.4")
-CHECK_INCLUDE_FILE_CXX ("FlexLexer.h"               ZORBA_HAVE_FLEXLEXER_H)
-CHECK_INCLUDE_FILES ("uuid/uuid.h"                  ZORBA_HAVE_UUID_H)
-
-CHECK_FUNCTION_EXISTS (strtof                     ZORBA_HAVE_STRTOF_FUNCTION)
-CHECK_FUNCTION_EXISTS (strtoll                    ZORBA_HAVE_STRTOLL_FUNCTION)
-CHECK_FUNCTION_EXISTS (_stricmp                   ZORBA_HAVE_STRICMP_FUNCTION)
-CHECK_FUNCTION_EXISTS (strcat_s                   ZORBA_HAVE_STRCAT_S_FUNCTION)
-CHECK_FUNCTION_EXISTS (strcpy_s                   ZORBA_HAVE_STRCPY_S_FUNCTION)
-
-SET(CMAKE_REQUIRED_LIBRARIES pthread)  
-CHECK_INCLUDE_FILES (pthread.h                    ZORBA_HAVE_PTHREAD_H)
-CHECK_FUNCTION_EXISTS(pthread_spin_init           ZORBA_HAVE_PTHREAD_SPINLOCK)
-CHECK_FUNCTION_EXISTS(pthread_mutex_init          ZORBA_HAVE_PTHREAD_MUTEX)
-SET(CMAKE_REQUIRED_LIBRARIES)  
-
-CHECK_INCLUDE_FILES ("sys/time.h;sys/resource.h"  ZORBA_HAVE_RUSAGE_INCLUDES)
-CHECK_FUNCTION_EXISTS (getrusage                  ZORBA_HAVE_RUSAGE_FUNCTION)
-
-CHECK_TYPE_SIZE("int32_t" ZORBA_HAVE_INT32_T) 
-CHECK_TYPE_SIZE("uint32_t" ZORBA_HAVE_UINT32_T) 
-CHECK_TYPE_SIZE("unsigned __int32" ZORBA_HAVE_MS_UINT32) 
-CHECK_TYPE_SIZE("__int32" ZORBA_HAVE_MS_INT32) 
-CHECK_TYPE_SIZE("int64_t" ZORBA_HAVE_INT64_T) 
-
-CHECK_STRUCT_HAS_MEMBER("struct tm" tm_gmtoff time.h 	ZORBA_HAVE_STRUCT_TM_TM_GMTOFF)
-CHECK_STRUCT_HAS_MEMBER("struct tm" __tm_gmtoff time.h 	ZORBA_HAVE_STRUCT_TM___TM_GMTOFF)
-
-# C++ built-in type sizes
-CHECK_TYPE_SIZE("double" ZORBA_SIZEOF_DOUBLE BUILTIN_TYPES_ONLY) 
-CHECK_TYPE_SIZE("float" ZORBA_SIZEOF_FLOAT BUILTIN_TYPES_ONLY) 
-CHECK_TYPE_SIZE("int" ZORBA_SIZEOF_INT BUILTIN_TYPES_ONLY) 
-CHECK_TYPE_SIZE("long" ZORBA_SIZEOF_LONG BUILTIN_TYPES_ONLY) 
-CHECK_TYPE_SIZE("long long" ZORBA_SIZEOF_LONG_LONG BUILTIN_TYPES_ONLY) 
-CHECK_TYPE_SIZE("void*" ZORBA_SIZEOF_POINTER BUILTIN_TYPES_ONLY) 
-CHECK_TYPE_SIZE("short" ZORBA_SIZEOF_SHORT BUILTIN_TYPES_ONLY) 
-CHECK_TYPE_SIZE("size_t" ZORBA_SIZEOF_SIZE_T) 
-SET(CMAKE_EXTRA_INCLUDE_FILES wchar.h)
-CHECK_TYPE_SIZE("wchar_t" ZORBA_SIZEOF_WCHAR_T)
-SET(CMAKE_EXTRA_INCLUDE_FILES)
-
-# C++11 langauge features
-CHECK_CXX_SOURCE_COMPILES("
-  #include <cstddef>
-  int main() { int *p = nullptr; }" ZORBA_CXX_NULLPTR)
-CHECK_CXX_SOURCE_COMPILES(
-  "int main() { static_assert(1,\"\"); }" ZORBA_CXX_STATIC_ASSERT)
-
-# C++11 standard library types
-CHECK_CXX_SOURCE_COMPILES("
-  #include <type_traits>
-  int main() { std::enable_if<true,int> x; }" ZORBA_HAVE_ENABLE_IF)
-CHECK_CXX_SOURCE_COMPILES("
-  #include <memory>
-  int main() { std::unique_ptr<int> p; }" ZORBA_HAVE_UNIQUE_PTR)
-CHECK_CXX_SOURCE_COMPILES("
-  #include <unordered_map>
-  int main() { std::unordered_map<int,int> m; }" ZORBA_HAVE_UNORDERED_MAP)
-CHECK_CXX_SOURCE_COMPILES("
-  #include <unordered_set>
-  int main() { std::unordered_set<int> s; }" ZORBA_HAVE_UNORDERED_SET)
-
 ################################################################################
 # Various cmake macros
 
@@ -236,6 +137,8 @@
 # this CMake depends on.                                                       #
 #                                                                              #
 ################################################################################
+INCLUDE(CheckFunctionExists)
+INCLUDE(CheckLibraryExists)
 
 FOREACH(path "${CMAKE_PREFIX_PATH}")
   IF(EXISTS "${path}")
@@ -409,6 +312,103 @@
 INCLUDE(CMakeConfiguration.txt)
 INCLUDE(CMakeCompiler.txt)
 
+###############################################################################
+# Check for system include files, features, etc.
+###############################################################################
+INCLUDE(CheckCXXSourceCompiles)
+INCLUDE(CheckIncludeFileCXX)
+INCLUDE(CheckIncludeFiles)
+INCLUDE(CheckStructHasMember)
+INCLUDE(CheckTypeSize)
+
+INCLUDE(TestBigEndian)
+TEST_BIG_ENDIAN( BIG_ENDIAN )
+IF (${BIG_ENDIAN})
+  SET( ZORBA_BIG_ENDIAN 1 )
+ELSE (${BIG_ENDIAN})
+  SET( ZORBA_LITTLE_ENDIAN 1 )
+ENDIF (${BIG_ENDIAN})
+
+CHECK_INCLUDE_FILES ("unicode/coll.h"               ZORBA_HAVE_COLL_H)
+CHECK_INCLUDE_FILES ("iconv.h"                      ZORBA_HAVE_ICONV_H)
+CHECK_INCLUDE_FILES ("inttypes.h"                   ZORBA_HAVE_INTTYPES_H)
+CHECK_INCLUDE_FILES ("limits.h"                     ZORBA_HAVE_LIMITS_H)
+CHECK_INCLUDE_FILES ("stdint.h"                     ZORBA_HAVE_STDINT_H)
+CHECK_INCLUDE_FILES ("stdlib.h"                     ZORBA_HAVE_STDLIB_H)
+CHECK_INCLUDE_FILES ("sys/param.h;sys/mount.h"      ZORBA_HAVE_SYS_MOUNT_H)
+CHECK_INCLUDE_FILES ("sys/types.h"                  ZORBA_HAVE_SYS_TYPES_H)
+CHECK_INCLUDE_FILES ("tzfile.h"                     ZORBA_HAVE_TZFILE_H)
+CHECK_INCLUDE_FILES ("unicode/ustring.h"            ZORBA_HAVE_USTRING_H)
+CHECK_INCLUDE_FILES ("unicode/utypes.h"             ZORBA_HAVE_UTYPES_H)
+
+IF (NOT APPLE OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.4")
+  # execinfo is found by this macro when cross compiling for Mac OS X 10.4
+  # although it shouldn't be found for this platform
+  CHECK_INCLUDE_FILES ("execinfo.h"                   ZORBA_HAVE_EXECINFO_H)
+ENDIF (NOT APPLE OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.4")
+CHECK_INCLUDE_FILE_CXX ("FlexLexer.h"               ZORBA_HAVE_FLEXLEXER_H)
+CHECK_INCLUDE_FILES ("uuid/uuid.h"                  ZORBA_HAVE_UUID_H)
+
+CHECK_FUNCTION_EXISTS (strtof                     ZORBA_HAVE_STRTOF_FUNCTION)
+CHECK_FUNCTION_EXISTS (strtoll                    ZORBA_HAVE_STRTOLL_FUNCTION)
+CHECK_FUNCTION_EXISTS (_stricmp                   ZORBA_HAVE_STRICMP_FUNCTION)
+CHECK_FUNCTION_EXISTS (strcat_s                   ZORBA_HAVE_STRCAT_S_FUNCTION)
+CHECK_FUNCTION_EXISTS (strcpy_s                   ZORBA_HAVE_STRCPY_S_FUNCTION)
+
+SET(CMAKE_REQUIRED_LIBRARIES pthread)  
+CHECK_INCLUDE_FILES (pthread.h                    ZORBA_HAVE_PTHREAD_H)
+CHECK_FUNCTION_EXISTS(pthread_spin_init           ZORBA_HAVE_PTHREAD_SPINLOCK)
+CHECK_FUNCTION_EXISTS(pthread_mutex_init          ZORBA_HAVE_PTHREAD_MUTEX)
+SET(CMAKE_REQUIRED_LIBRARIES)  
+
+CHECK_INCLUDE_FILES ("sys/time.h;sys/resource.h"  ZORBA_HAVE_RUSAGE_INCLUDES)
+CHECK_FUNCTION_EXISTS (getrusage                  ZORBA_HAVE_RUSAGE_FUNCTION)
+
+CHECK_TYPE_SIZE("int32_t" ZORBA_HAVE_INT32_T) 
+CHECK_TYPE_SIZE("uint32_t" ZORBA_HAVE_UINT32_T) 
+CHECK_TYPE_SIZE("unsigned __int32" ZORBA_HAVE_MS_UINT32) 
+CHECK_TYPE_SIZE("__int32" ZORBA_HAVE_MS_INT32) 
+CHECK_TYPE_SIZE("int64_t" ZORBA_HAVE_INT64_T) 
+
+CHECK_STRUCT_HAS_MEMBER("struct tm" tm_gmtoff time.h 	ZORBA_HAVE_STRUCT_TM_TM_GMTOFF)
+CHECK_STRUCT_HAS_MEMBER("struct tm" __tm_gmtoff time.h 	ZORBA_HAVE_STRUCT_TM___TM_GMTOFF)
+
+# C++ built-in type sizes
+CHECK_TYPE_SIZE("double" ZORBA_SIZEOF_DOUBLE BUILTIN_TYPES_ONLY) 
+CHECK_TYPE_SIZE("float" ZORBA_SIZEOF_FLOAT BUILTIN_TYPES_ONLY) 
+CHECK_TYPE_SIZE("int" ZORBA_SIZEOF_INT BUILTIN_TYPES_ONLY) 
+CHECK_TYPE_SIZE("long" ZORBA_SIZEOF_LONG BUILTIN_TYPES_ONLY) 
+CHECK_TYPE_SIZE("long long" ZORBA_SIZEOF_LONG_LONG BUILTIN_TYPES_ONLY) 
+CHECK_TYPE_SIZE("void*" ZORBA_SIZEOF_POINTER BUILTIN_TYPES_ONLY) 
+CHECK_TYPE_SIZE("short" ZORBA_SIZEOF_SHORT BUILTIN_TYPES_ONLY) 
+CHECK_TYPE_SIZE("size_t" ZORBA_SIZEOF_SIZE_T) 
+SET(CMAKE_EXTRA_INCLUDE_FILES wchar.h)
+CHECK_TYPE_SIZE("wchar_t" ZORBA_SIZEOF_WCHAR_T)
+SET(CMAKE_EXTRA_INCLUDE_FILES)
+
+# C++11 langauge features
+CHECK_CXX_SOURCE_COMPILES("
+  #include <cstddef>
+  int main() { int *p = nullptr; }" ZORBA_CXX_NULLPTR)
+CHECK_CXX_SOURCE_COMPILES(
+  "int main() { static_assert(1,\"\"); }" ZORBA_CXX_STATIC_ASSERT)
+
+# C++11 standard library types
+CHECK_CXX_SOURCE_COMPILES("
+  #include <type_traits>
+  int main() { std::enable_if<true,int> x; }" ZORBA_HAVE_ENABLE_IF)
+CHECK_CXX_SOURCE_COMPILES("
+  #include <memory>
+  int main() { std::unique_ptr<int> p; }" ZORBA_HAVE_UNIQUE_PTR)
+CHECK_CXX_SOURCE_COMPILES("
+  #include <unordered_map>
+  int main() { std::unordered_map<int,int> m; }" ZORBA_HAVE_UNORDERED_MAP)
+CHECK_CXX_SOURCE_COMPILES("
+  #include <unordered_set>
+  int main() { std::unordered_set<int> s; }" ZORBA_HAVE_UNORDERED_SET)
+
+###############################################################################
+
 #
 #  LibXslt
 #

=== modified file 'bin/debugger/command.h'
--- bin/debugger/command.h	2013-08-14 08:46:44 +0000
+++ bin/debugger/command.h	2013-10-30 14:44:09 +0000
@@ -28,7 +28,6 @@
 #include <zorba/config.h>
 #include <zorba/internal/unique_ptr.h>
 #include "command_arg.h"
-#include "tuple.h"
 
 
 namespace zorba { namespace debugger {

=== modified file 'bin/debugger/command_arg.h'
--- bin/debugger/command_arg.h	2013-09-24 02:02:30 +0000
+++ bin/debugger/command_arg.h	2013-10-30 14:44:09 +0000
@@ -22,8 +22,6 @@
 #include <set>
 #include <sstream>
 
-#include "tuple.h"
-
 
 namespace zorba { namespace debugger {
 

=== modified file 'bin/debugger/command_line_handler.cpp'
--- bin/debugger/command_line_handler.cpp	2013-02-07 17:24:36 +0000
+++ bin/debugger/command_line_handler.cpp	2013-10-30 14:44:09 +0000
@@ -138,7 +138,7 @@
 
 template<>
 void
-CommandLineHandler::handle<BreakpointSet>(std::tr1::tuple<bstring, bstring, bint> &aTuple)
+CommandLineHandler::handle<BreakpointSet>(tuple<bstring, bstring, bint> &aTuple)
 {
   DebuggerClient::BreakpointType lType = DebuggerClient::Line;
   bool lEnabled = true;

=== modified file 'bin/debugger/command_line_handler.h'
--- bin/debugger/command_line_handler.h	2013-02-07 17:24:36 +0000
+++ bin/debugger/command_line_handler.h	2013-10-30 14:44:09 +0000
@@ -17,8 +17,15 @@
 #ifndef ZORBA_DEBUGGER_COMMAND_LINE_HANDLER_H
 #define ZORBA_DEBUGGER_COMMAND_LINE_HANDLER_H
 
+#include <zorba/config.h>
+
 #include <set>
 #include <cassert>
+#if ZORBA_TR1_IN_TR1_SUBDIRECTORY
+# include <tr1/tuple>
+#else
+# include <tuple>
+#endif
 
 #include <zorba/debugger_client.h>
 
@@ -179,4 +186,5 @@
 } // namespace zorba
 } // namespace debugger
 
-#endif // ZORBA_DEBUGGER_COMMAND_LINE_HANDLER_H
+#endif /* ZORBA_DEBUGGER_COMMAND_LINE_HANDLER_H */
+/* vim:set et sw=2 ts=2: */

=== removed file 'bin/debugger/tuple.h'
--- bin/debugger/tuple.h	2013-02-07 17:24:36 +0000
+++ bin/debugger/tuple.h	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-#pragma once
-#ifndef ZORBA_DEBUGGER_TUPLE_H
-#define ZORBA_DEBUGGER_TUPLE_H
-
-#include <zorba/config.h>
-
-#if ZORBA_TR1_IN_TR1_SUBDIRECTORY
-# include <tr1/tuple>
-#else
-# include <tuple>
-#endif
-
-#endif // ZORBA_DEBUGGER_TUPLE_H

=== modified file 'include/zorba/internal/cxx_util.h'
--- include/zorba/internal/cxx_util.h	2013-10-27 15:31:16 +0000
+++ include/zorba/internal/cxx_util.h	2013-10-30 14:44:09 +0000
@@ -74,16 +74,23 @@
 template<>     struct zorba_static_assert<true> { };
 template<int>  struct zorba_static_assert_type { };
 
+#define static_assert_helper_2(EXPR,MSG,LINE)     \
+  typedef ::zorba_static_assert_type<             \
+    sizeof( ::zorba_static_assert<(EXPR) != 0> )  \
+  > zorba_static_assert_type_##LINE
+
+// See: http://stackoverflow.com/a/1597129/99089
+#define static_assert_helper_1(EXPR,MSG,LINE) \
+  static_assert_helper_2(EXPR,MSG,LINE)
+
 /** 
  * \internal
  * A \c static_assert macro for C++ compilers that don't yet implement C++11's
  * \c static_assert keyword.
  * \hideinitializer
  */
-#define static_assert(expr,msg)                   \
-  typedef ::zorba_static_assert_type<             \
-    sizeof( ::zorba_static_assert<(expr) != 0> )  \
-  > zorba_static_assert_type_##__LINE__
+#define static_assert(EXPR,MSG) \
+  static_assert_helper_1(EXPR,MSG,__LINE__)
 
 #endif /* ZORBA_CXX_STATIC_ASSERT */
 

=== modified file 'src/runtime/full_text/ft_module_impl.cpp'
--- src/runtime/full_text/ft_module_impl.cpp	2013-10-10 03:54:10 +0000
+++ src/runtime/full_text/ft_module_impl.cpp	2013-10-30 14:44:09 +0000
@@ -555,10 +555,8 @@
       ERROR_LOC( loc )
     );
 
-  state->tresult_ = std::move(
-    state->thesaurus_->lookup(
-      state->phrase_, state->relationship_, state->at_least_, state->at_most_
-    )
+  state->tresult_ = state->thesaurus_->lookup(
+    state->phrase_, state->relationship_, state->at_least_, state->at_most_
   );
   if ( state->tresult_ )
     while ( state->tresult_->next( &synonym ) ) {
@@ -576,10 +574,8 @@
     StateTraitsImpl<ThesaurusLookupIteratorState>::getState(
       plan_state, this->theStateOffset
     );
-  state->tresult_ = std::move(
-    state->thesaurus_->lookup(
-      state->phrase_, state->relationship_, state->at_least_, state->at_most_
-    )
+  state->tresult_ = state->thesaurus_->lookup(
+    state->phrase_, state->relationship_, state->at_least_, state->at_most_
   );
 }
 

=== modified file 'src/runtime/seq/seq_impl.cpp'
--- src/runtime/seq/seq_impl.cpp	2013-10-07 23:26:13 +0000
+++ src/runtime/seq/seq_impl.cpp	2013-10-30 14:44:09 +0000
@@ -24,6 +24,7 @@
 #include "runtime/seq/seq.h"
 #include "runtime/seq/seq_util.h"
 #include "types/typemanager.h"
+#include "util/hash/rehash_policy.h"
 #include "util/stl_util.h"
 
 using namespace std;
@@ -43,7 +44,7 @@
   ;
 
   return new Item_set_type(
-     lBucketCount,
+    lBucketCount,
     Item_set_type::hasher(),
     Item_value_equal( tm, tz, coll, loc )
   );

=== modified file 'src/util/tracer.h'
--- src/util/tracer.h	2013-02-07 17:24:36 +0000
+++ src/util/tracer.h	2013-10-30 14:44:09 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2008 The FLWOR Foundation.
+ * Copyright 2006-2013 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.
@@ -13,32 +13,42 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #pragma once
 #ifndef ZORBA_TRACER_H
 #define ZORBA_TRACER_H
 
-namespace zorba {
-
-
-#if !defined WIN32 && !defined WINCE
-#define TRACE __PRETTY_FUNCTION__<<" ("__FILE__<<':'<<std::dec<<__LINE__<<")"
-#define LOCATION	(__oss.str(""), \
-                   __oss<<__FILE__<<":"<<std::dec<<__LINE__<<"::"<<__PRETTY_FUNCTION__, \
-									 __oss.str())
-#elif defined WIN32
-#define TRACE __FUNCSIG__<<" ("__FILE__<<':'<<std::dec<<__LINE__<<")"
-#define LOCATION	(__oss.str(""), \
-                   __oss<<__FILE__<<":"<<std::dec<<__LINE__<<"::"<<__FUNCTION__, \
-									 __oss.str())
+#if !defined( WIN32 ) && !defined( WINCE )
+
+#define TRACE \
+  __PRETTY_FUNCTION__ << " (" << __FILE__ << ':' << std::dec << __LINE__ << ')'
+
+#define LOCATION \
+  (__oss.str(""), \
+  __oss << __FILE__ << ':' << std::dec << __LINE__ << "::" << __PRETTY_FUNCTION__, \
+  __oss.str())
+
+#elif defined( WIN32 )
+
+#define TRACE \
+  __FUNCSIG__ << " (" << __FILE__ << ':' << std::dec << __LINE__ << ')'
+
+#define LOCATION \
+  (__oss.str(""), \
+  __oss << __FILE__ << ":" << std::dec << __LINE__ << "::" <<__FUNCTION__, \
+  __oss.str())
+
 #else
-#define TRACE __FILE__<<':'<<std::dec<<__LINE__<<"::"<<__FUNCTION__
-#define LOCATION	(__oss.str(""), \
-										__oss<<__FILE__<<":"<<std::dec<<__LINE__<<"::"<<__FUNCTION__, \
-										__oss.str())
+
+#define TRACE \
+  __FILE__ << ':' << std::dec << __LINE__ << "::" << __FUNCTION__
+
+#define LOCATION \
+  (__oss.str(""), \
+  __oss << __FILE__ << ':' << std::dec << __LINE__ << "::" << __FUNCTION__, \
+  __oss.str())
+
 #endif
 
-
-} /* namespace zorba */
-
 #endif /* ZORBA_TRACER_H */
 /* vim:set et sw=2 ts=2: */

=== modified file 'src/zorbatypes/timezone.cpp'
--- src/zorbatypes/timezone.cpp	2013-05-22 23:33:54 +0000
+++ src/zorbatypes/timezone.cpp	2013-10-30 14:44:09 +0000
@@ -87,7 +87,7 @@
 }
 
 size_t TimeZone::hash() const {
-  std::hash<value_type> const hasher;
+  std::hash<value_type> hasher;
   return !*this ? hasher( ~0 ) : hasher( gmtoff_ );
 }