bug fixing

2025-10-05 19:18:01 +08:00 · 2015-07-22 20:10:46 +02:00 · 2015-07-22 20:10:46 +02:00 · 456a345e48
commit 456a345e48
parent 8f3c28a7e7
23 changed files with 609 additions and 534 deletions
--- a/5
+++ b/5
@ -28247,18 +28247,19 @@ $as_echo "$ulib_cc_flag" >&6; }

 	MAYBE_FLAGS="-Wstrict-aliasing=2 -Wall -Wextra -Wsign-compare -Wpointer-arith -Wwrite-strings -Wlogical-op \
 					 -Wmissing-declarations -Wpacked -Wswitch-enum -Wmissing-format-attribute -Winit-self -Wformat \
-					 -Wformat-extra-args -Wenum-compare"
+					 -Wformat-extra-args -Wenum-compare -Wswitch-bool -Wlogical-not-parentheses -Wsizeof-array-argument -Wbool-compare"
 	# -------------------------------------------------------------------------------------
 	# to turn various gcc/glibc-specific preprocessor checks
 	# -------------------------------------------------------------------------------------
 	# -Wno-format -Wno-format-extra-args
+	# -Wsuggest-final-methods -Wsuggest-final-types
 	# -------------------------------------------------------------------------------------

 	# -Wcast-qual
 	CC_MAYBE_FLAGS="-Werror-implicit-function-declaration -Wstrict-prototypes -Wc++-compat \
 						 -Wmissing-prototypes -Wnested-externs -Wdeclaration-after-statement -Wold-style-definition -Wsizeof-pointer-memaccess"

-	CXX_MAYBE_FLAGS="-fno-check-new -fno-enforce-eh-specs -Wno-deprecated -Wdelete-non-virtual-dtor"
+	CXX_MAYBE_FLAGS="-fno-check-new -fno-enforce-eh-specs -Wno-deprecated -Wdelete-non-virtual-dtor -Wodr"

 	case "$gcc_version" in
 		2*|3*|4.0*|4.1*|4.2*)
--- a/configure.ac
+++ b/configure.ac
@ -1955,18 +1955,19 @@ if test "$ac_cv_c_compiler_gnu" = "yes" -a "x$GCC_IS_CLANG" = xno; then

 	MAYBE_FLAGS="-Wstrict-aliasing=2 -Wall -Wextra -Wsign-compare -Wpointer-arith -Wwrite-strings -Wlogical-op \
 					 -Wmissing-declarations -Wpacked -Wswitch-enum -Wmissing-format-attribute -Winit-self -Wformat \
-					 -Wformat-extra-args -Wenum-compare"
+					 -Wformat-extra-args -Wenum-compare -Wswitch-bool -Wlogical-not-parentheses -Wsizeof-array-argument -Wbool-compare"
 	# -------------------------------------------------------------------------------------
 	# to turn various gcc/glibc-specific preprocessor checks
 	# -------------------------------------------------------------------------------------
 	# -Wno-format -Wno-format-extra-args
+	# -Wsuggest-final-methods -Wsuggest-final-types
 	# -------------------------------------------------------------------------------------

 	# -Wcast-qual
 	CC_MAYBE_FLAGS="-Werror-implicit-function-declaration -Wstrict-prototypes -Wc++-compat \
 						 -Wmissing-prototypes -Wnested-externs -Wdeclaration-after-statement -Wold-style-definition -Wsizeof-pointer-memaccess"

-	CXX_MAYBE_FLAGS="-fno-check-new -fno-enforce-eh-specs -Wno-deprecated -Wdelete-non-virtual-dtor"
+	CXX_MAYBE_FLAGS="-fno-check-new -fno-enforce-eh-specs -Wno-deprecated -Wdelete-non-virtual-dtor -Wodr"

 	case "$gcc_version" in
 		2*|3*|4.0*|4.1*|4.2*)
--- a/include/ulib/examples/wi_auth_declaration.h
+++ b/include/ulib/examples/wi_auth_declaration.h
@ -307,6 +307,9 @@ public:
                        num_login, num_auth_domain_ALL, num_auth_domain_FICARD, traffic_done);
      }

+   // STREAMS
+
+#if defined(U_STDCPP_ENABLE)
   void fromStream(istream& is)
      {
      U_TRACE(5, "WiAuthAccessPoint::fromStream(%p)", &is)
@ -333,9 +336,6 @@ public:
         >> traffic_done;
      }

-   // STREAMS
-
-#if defined(U_STDCPP_ENABLE)
   friend istream& operator>>(istream& is, WiAuthAccessPoint& _ap) { _ap.fromStream(is); return is; }

 #  ifdef DEBUG
--- a/include/ulib/internal/common.h
+++ b/include/ulib/internal/common.h
@ -75,15 +75,15 @@ extern U_EXPORT void  operator delete[](void*);
 #endif

 #ifdef U_COMPILER_EXPLICIT_OVERRIDES
-# define U_DECL_OVERRIDE override
 # define U_DECL_FINAL final
+# define U_DECL_OVERRIDE override
 #else
-# ifndef U_DECL_OVERRIDE
-# define U_DECL_OVERRIDE
-# endif
 # ifndef U_DECL_FINAL
 # define U_DECL_FINAL
 # endif
+# ifndef U_DECL_OVERRIDE
+# define U_DECL_OVERRIDE
+# endif
 #endif

 #ifdef U_COMPILER_NOEXCEPT
--- a/include/ulib/internal/memory_pool.h
+++ b/include/ulib/internal/memory_pool.h
@ -481,10 +481,14 @@ public:
   static const char* func_call;

   static bool check(void* ptr);
-#  ifdef U_STDCPP_ENABLE
+# ifdef U_STDCPP_ENABLE
+#  ifdef __clang__
+   static void printInfo(     ostream& os);
+#  else
   static void printInfo(std::ostream& os);
-   static void writeInfoTo(const char* format, ...);
 #  endif
+   static void writeInfoTo(const char* format, ...);
+# endif
 #endif

 private:
--- a/include/ulib/log.h
+++ b/include/ulib/log.h
@ -134,7 +134,7 @@ protected:
 #ifdef USE_LIBZ
   UString*   buf_path_compress;
   uint32_t index_path_compress;
-   bool checkForLogRotateDataToWrite();
+   void checkForLogRotateDataToWrite();
 #endif

   static long tv_sec_old_1, tv_sec_old_2, tv_sec_old_3;
--- a/include/ulib/net/server/client_image_rdb.h
+++ b/include/ulib/net/server/client_image_rdb.h
@ -25,7 +25,7 @@

 class URDB;

-class U_EXPORT URDBClientImage : public UClientImage<UTCPSocket> {
+class U_EXPORT URDBClientImage U_DECL_FINAL : public UClientImage<UTCPSocket> {
 public:

   URDBClientImage() : UClientImage<UTCPSocket>()
--- a/include/ulib/net/unixsocket.h
+++ b/include/ulib/net/unixsocket.h
@ -86,7 +86,7 @@ public:

   // VIRTUAL METHOD

-   virtual bool connectServer(const UString& pathname, unsigned int iServPort, int timeoutMS = 0) U_DECL_OVERRIDE;
+   virtual bool connectServer(const UString& pathname, unsigned int iServPort, int timeoutMS = 0) U_DECL_FINAL;

   // DEBUG

--- a/include/ulib/ssl/net/ssl_session.h
+++ b/include/ulib/ssl/net/ssl_session.h
@ -36,15 +36,15 @@ public:
      U_TRACE_REGISTER_OBJECT(0, USSLSession, "", 0)
      }

-   virtual ~USSLSession()
+   virtual ~USSLSession() U_DECL_FINAL
      {
      U_TRACE_UNREGISTER_OBJECT(0, USSLSession)
      }

   // define method VIRTUAL of class UDataStorage

-   virtual char* toBuffer();
-   virtual void  fromData(const char* ptr, uint32_t len);
+   virtual char* toBuffer() U_DECL_FINAL;
+   virtual void  fromData(const char* ptr, uint32_t len) U_DECL_FINAL;

   // SERVICES

--- a/include/ulib/ssl/net/sslsocket.h
+++ b/include/ulib/ssl/net/sslsocket.h
@ -243,15 +243,15 @@ public:

   // VIRTUAL METHOD

-   virtual int send(const char* pData,   uint32_t iDataLen) U_DECL_OVERRIDE;
-   virtual int recv(      void* pBuffer, uint32_t iBufferLen) U_DECL_OVERRIDE;
+   virtual int send(const char* pData,   uint32_t iDataLen) U_DECL_FINAL;
+   virtual int recv(      void* pBuffer, uint32_t iBufferLen) U_DECL_FINAL;

   /**
    * This method is called to connect the socket to a server SSL that is specified
    * by the provided host name and port number. We call the SSL_connect() function to perform the connection
    */

-   virtual bool connectServer(const UString& server, unsigned int iServPort, int timeoutMS = 0) U_DECL_OVERRIDE;
+   virtual bool connectServer(const UString& server, unsigned int iServPort, int timeoutMS = 0) U_DECL_FINAL;

 #if defined(U_STDCPP_ENABLE) && defined(DEBUG)
   const char* dump(bool reset) const;
--- a/include/ulib/utility/data_session.h
+++ b/include/ulib/utility/data_session.h
@ -216,7 +216,12 @@ public:

   // define method VIRTUAL of class UDataStorage

-   virtual void clear();
+   virtual void clear() U_DECL_OVERRIDE
+      {
+      U_TRACE(0, "UDataSession::clear()")
+
+      vec_var->clear();
+      }

   // STREAM

--- a/include/ulib/utility/uhttp.h
+++ b/include/ulib/utility/uhttp.h
@ -1058,6 +1058,7 @@ private:
   static bool checkGetRequestIfRange() U_NO_EXPORT;
   static bool checkGetRequestIfModified() U_NO_EXPORT;
   static void setCGIShellScript(UString& command) U_NO_EXPORT;
+   static bool checkIfSourceHasChangedAndCompileUSP() U_NO_EXPORT;
   static void removeDataSession(const UString& token) U_NO_EXPORT;
   static bool checkIfUSP(UStringRep* key, void* value) U_NO_EXPORT;
   static bool compileUSP(const char* path, uint32_t len) U_NO_EXPORT;
@ -1068,7 +1069,6 @@ private:
   static bool splitCGIOutput(const char*& ptr1, const char* ptr2) U_NO_EXPORT;
   static void putDataInCache(const UString& fmt, UString& content) U_NO_EXPORT;
   static bool checkDataSession(const UString& token, time_t expire) U_NO_EXPORT;
-   static bool checkIfSourceHasChangedAndCompileUSP(UServletPage* usp_page) U_NO_EXPORT;
   static bool readDataChunked(USocket* sk, UString* pbuffer, UString& body) U_NO_EXPORT;
   static void setResponseForRange(uint32_t start, uint32_t end, uint32_t header) U_NO_EXPORT;

--- a/src/ulib/base/utility.c
+++ b/src/ulib/base/utility.c
@ -1935,7 +1935,7 @@ static inline void make_absolute(char* restrict result, const char* restrict dot
 */

 #ifdef _MSWINDOWS_
-#  define U_PATH_DEFAULT "C:\\msys\\1.0\\bin;C:\\MinGW\\bin;C:\\windows;C:\\windows\\system;C:\\windows\\system32"
+#define U_PATH_DEFAULT "C:\\msys\\1.0\\bin;C:\\MinGW\\bin;C:\\windows;C:\\windows\\system;C:\\windows\\system32"

 static const char* u_check_for_suffix_exe(const char* restrict program)
 {
@ -1959,7 +1959,7 @@ static const char* u_check_for_suffix_exe(const char* restrict program)
   return program;
 }
 #else
-#  define U_PATH_DEFAULT "/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin"
+#define U_PATH_DEFAULT "/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin"
 #endif

 bool u_pathfind(char* restrict result, const char* restrict path, uint32_t path_len, const char* restrict filename, int mode)
--- a/src/ulib/dynamic/dynamic.cpp
+++ b/src/ulib/dynamic/dynamic.cpp
@ -33,7 +33,9 @@ bool UDynamic::load(const char* pathname)
 #ifdef _MSWINDOWS_
   handle = ::LoadLibrary(pathname);
 #else
-   /* Perform lazy binding
+   /**
+    * --------------------------------------------------------------------
+    * Perform lazy binding
    * --------------------------------------------------------------------
    * Only resolve symbols as the code that references them is executed.
    * If the symbol is never referenced, then it is never resolved.
--- a/src/ulib/log.cpp
+++ b/src/ulib/log.cpp
@ -208,9 +208,13 @@ void ULog::initDate()

   (void) U_SYSCALL(gettimeofday, "%p,%p", u_now, 0);

-   (void) u_strftime2(date.date1, 17,                     "%d/%m/%y %T",                                                  u_now->tv_sec + u_now_adjust);
-   (void) u_strftime2(date.date2, 26,                     "%d/%b/%Y:%T %z",                                               u_now->tv_sec + u_now_adjust);
-   (void) u_strftime2(date.date3, 6+29+2+12+2+17+2, "Date: %a, %d %b %Y %T GMT\r\nServer: ULib\r\nConnection: close\r\n", u_now->tv_sec);
+   tv_sec_old_1 =
+   tv_sec_old_2 =
+   tv_sec_old_3 = u_now->tv_sec;
+
+   (void) u_strftime2(date.date1, 17,                     "%d/%m/%y %T",                                                  tv_sec_old_1 + u_now_adjust);
+   (void) u_strftime2(date.date2, 26,                     "%d/%b/%Y:%T %z",                                               tv_sec_old_2 + u_now_adjust);
+   (void) u_strftime2(date.date3, 6+29+2+12+2+17+2, "Date: %a, %d %b %Y %T GMT\r\nServer: ULib\r\nConnection: close\r\n", tv_sec_old_3);
 }

 void ULog::startup()
@ -279,9 +283,7 @@ void ULog::updateDate1()
 #ifdef ENABLE_THREAD
   if (u_pthread_time)
      {
-#  if defined(U_LOG_ENABLE) && defined(USE_LIBZ)
      (void) U_SYSCALL(pthread_rwlock_rdlock, "%p", prwlock);
-#  endif

      if (tv_sec_old_1 != u_now->tv_sec)
         {
@ -289,6 +291,8 @@ void ULog::updateDate1()

         U_INTERNAL_DUMP("tv_sec_old_1 = %lu u_now->tv_sec = %lu", tv_sec_old_1, tv_sec)

+         U_INTERNAL_ASSERT_MINOR(tv_sec_old_1, tv_sec)
+
         if ((tv_sec - tv_sec_old_1) != 1 ||
             (tv_sec % U_ONE_HOUR_IN_SECOND) == 0)
            {
@ -307,9 +311,7 @@ void ULog::updateDate1()
         U_INTERNAL_ASSERT_EQUALS(tv_sec, tv_sec_old_1)
         }

-#  if defined(U_LOG_ENABLE) && defined(USE_LIBZ)
      (void) U_SYSCALL(pthread_rwlock_unlock, "%p", prwlock);
-#  endif
      }
   else
 #endif
@ -324,6 +326,8 @@ void ULog::updateDate1()

      U_INTERNAL_DUMP("tv_sec_old_1 = %lu u_now->tv_sec = %lu", tv_sec_old_1, tv_sec)

+      U_INTERNAL_ASSERT_MINOR(tv_sec_old_1, tv_sec)
+
      if ((tv_sec - tv_sec_old_1) != 1 ||
          (tv_sec % U_ONE_HOUR_IN_SECOND) == 0)
         {
@ -355,9 +359,7 @@ void ULog::updateDate2()
 #ifdef ENABLE_THREAD
   if (u_pthread_time)
      {
-#  if defined(U_LOG_ENABLE) && defined(USE_LIBZ)
      (void) U_SYSCALL(pthread_rwlock_rdlock, "%p", prwlock);
-#  endif

      if (tv_sec_old_2 != u_now->tv_sec)
         {
@ -365,6 +367,8 @@ void ULog::updateDate2()

         U_INTERNAL_DUMP("tv_sec_old_2 = %lu u_now->tv_sec = %lu", tv_sec_old_2, tv_sec)

+         U_INTERNAL_ASSERT_MINOR(tv_sec_old_2, tv_sec)
+
         if ((tv_sec - tv_sec_old_2) != 1 ||
             (tv_sec % U_ONE_HOUR_IN_SECOND) == 0)
            {
@ -383,9 +387,7 @@ void ULog::updateDate2()
         U_INTERNAL_ASSERT_EQUALS(tv_sec, tv_sec_old_2)
         }

-#  if defined(U_LOG_ENABLE) && defined(USE_LIBZ)
      (void) U_SYSCALL(pthread_rwlock_unlock, "%p", prwlock);
-#  endif
      }
   else
 #endif
@ -400,6 +402,8 @@ void ULog::updateDate2()

      U_INTERNAL_DUMP("tv_sec_old_2 = %lu u_now->tv_sec = %lu", tv_sec_old_2, tv_sec)

+      U_INTERNAL_ASSERT_MINOR(tv_sec_old_2, tv_sec)
+
      if ((tv_sec - tv_sec_old_2) != 1 ||
          (tv_sec % U_ONE_HOUR_IN_SECOND) == 0)
         {
@ -432,9 +436,7 @@ void ULog::updateDate3()
 #ifdef ENABLE_THREAD
   if (u_pthread_time)
      {
-#  if defined(U_LOG_ENABLE) && defined(USE_LIBZ)
      (void) U_SYSCALL(pthread_rwlock_rdlock, "%p", prwlock);
-#  endif

      if (tv_sec_old_3 != u_now->tv_sec)
         {
@ -442,6 +444,8 @@ void ULog::updateDate3()

         U_INTERNAL_DUMP("tv_sec_old_3 = %lu u_now->tv_sec = %lu", tv_sec_old_3, tv_sec)

+         U_INTERNAL_ASSERT_MINOR(tv_sec_old_3, tv_sec)
+
         if ((tv_sec - tv_sec_old_3) != 1 ||
             (tv_sec % U_ONE_HOUR_IN_SECOND) == 0)
            {
@ -460,9 +464,7 @@ void ULog::updateDate3()
         U_INTERNAL_ASSERT_EQUALS(tv_sec, tv_sec_old_3)
         }

-#  if defined(U_LOG_ENABLE) && defined(USE_LIBZ)
      (void) U_SYSCALL(pthread_rwlock_unlock, "%p", prwlock);
-#  endif
      }
   else
 #endif
@ -477,6 +479,8 @@ void ULog::updateDate3()

      U_INTERNAL_DUMP("tv_sec_old_3 = %lu u_now->tv_sec = %lu", tv_sec_old_3, tv_sec)

+      U_INTERNAL_ASSERT_MINOR(tv_sec_old_3, tv_sec)
+
      if ((tv_sec - tv_sec_old_3) != 1 ||
          (tv_sec % U_ONE_HOUR_IN_SECOND) == 0)
         {
@ -608,7 +612,7 @@ void ULog::write(const struct iovec* iov, int n)

            if (file_ptr <= log_gzip_sz)
               {
-               (void) checkForLogRotateDataToWrite(); // check if there are previous data to write
+               checkForLogRotateDataToWrite(); // check if there are previous data to write

               ptr_log_data->gzip_len = u_gz_deflate(UFile::map, file_ptr, (char*)ptr_log_data+sizeof(log_data), true);

@ -970,7 +974,7 @@ void ULog::closeLog()
   // msync();

 #  ifdef USE_LIBZ
-      (void) checkForLogRotateDataToWrite(); // check for previous data to write
+      checkForLogRotateDataToWrite(); // check for previous data to write
 #  endif

      U_INTERNAL_ASSERT_EQUALS(ptr_log_data->gzip_len, 0)
@ -1023,7 +1027,7 @@ UString ULog::getDirLogGz()
   U_RETURN_STRING(result);
 }

-bool ULog::checkForLogRotateDataToWrite()
+void ULog::checkForLogRotateDataToWrite()
 {
   U_TRACE(0, "ULog::checkForLogRotateDataToWrite()")

@ -1038,11 +1042,7 @@ bool ULog::checkForLogRotateDataToWrite()
      (void) UFile::writeTo(*buf_path_compress, (char*)ptr_log_data+sizeof(log_data), ptr_log_data->gzip_len, false, false);

      ptr_log_data->gzip_len = 0;
-
-      U_RETURN(true);
      }
-
-   U_RETURN(false);
 }
 #endif

--- a/src/ulib/net/server/client_image.cpp
+++ b/src/ulib/net/server/client_image.cpp
@ -135,13 +135,8 @@ UClientImage_Base::UClientImage_Base()
      {
      UServer_Base::pClientImage = this;
      UServer_Base::eClientImage = this + UNotifier::max_connection;
-
-      U_INTERNAL_DUMP("UServer_Base::pClientImage = %p UServer_Base::eClientImage = %p UNotifier::max_connection = %u",
-                       UServer_Base::pClientImage,     UServer_Base::eClientImage,     UNotifier::max_connection)
      }

-   U_INTERNAL_DUMP("new T[%u]: elem %u of %u", UNotifier::max_connection, (this - UServer_Base::pClientImage), UNotifier::max_connection)
-
 #ifndef U_HTTP2_DISABLE
   connection = U_NEW(UHTTP2::Connection);

@ -1496,7 +1491,7 @@ bool UClientImage_Base::writeResponse()

 #  if defined(ENABLE_THREAD) && !defined(U_LOG_ENABLE) && !defined(USE_LIBZ)
      U_INTERNAL_ASSERT_POINTER(u_pthread_time)
-      U_INTERNAL_ASSERT_EQUALS(iov_vec[1].iov_base, UServer_Base::ptr_shared_data->log_date_shared.date3)
+      U_INTERNAL_ASSERT_EQUALS(iov_vec[1].iov_base, ULog::ptr_shared_date->date3)
 #  else
      U_INTERNAL_ASSERT_EQUALS(iov_vec[1].iov_base, ULog::date.date3)

--- a/src/ulib/net/server/plugin/usp/usp_compile.sh.in
+++ b/src/ulib/net/server/plugin/usp/usp_compile.sh.in
@ -11,7 +11,11 @@ exec_prefix=@exec_prefix@
 dirn=`dirname $1`
 basen=`basename $1`

+libsuffix=$2
+test "$libsuffix" || libsuffix=so
+
 export UMEMPOOL="0,0,0,48,-20,-20,-20,-20,0"
+export PATH="/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin"

 ${prefix}/bin/usp_translator $1.usp &&
 ${prefix}/bin/usp_libtool.sh --silent --tag=CXX --mode=compile \
@ -19,4 +23,4 @@ ${prefix}/bin/usp_libtool.sh --silent --tag=CXX --mode=compile \
 ${prefix}/bin/usp_libtool.sh --silent --tag=CXX --mode=link \
 	@CXX@ @CPPFLAGS@ @LDFLAGS@ @USP_LDFLAGS@ -o $1.la -rpath ${prefix}/libexec/ulib/usp \
 	-module -export-dynamic -avoid-version -no-undefined $1.lo @USP_LIBS@ -l@ULIB@ @ULIB_LIBS@ &&
-mv $1.usp ${dirn}/.libs; rm -rf $1.*; mv ${dirn}/.libs/${basen}.usp ${dirn}/.libs/${basen}.$2 ${dirn}; rm -rf ${dirn}/.libs
+mv $1.usp ${dirn}/.libs; rm -rf $1.d $1.la $1.lo $1.o $1.cpp; mv ${dirn}/.libs/${basen}.usp ${dirn}/.libs/${basen}.$libsuffix ${dirn}; rm -rf ${dirn}/.libs
--- a/src/ulib/net/server/plugin/usp/usp_translator.cpp
+++ b/src/ulib/net/server/plugin/usp/usp_translator.cpp
@ -30,7 +30,7 @@
 #include <ulib/application.h>

 #define USP_SESSION_INIT \
-"static void usp_init_%.*s()\n" \
+"\n\t\nstatic void usp_init_%.*s()\n" \
 "{\n" \
 "\tU_TRACE(5, \"::usp_init_%.*s()\")\n" \
 "\t\n" \
@ -472,8 +472,8 @@ public:
         buffer.snprintf(USP_SESSION_INIT,
                         size, ptr,
                         size, ptr,
-                         (bsession ? "\n\tif (UHTTP::data_session == 0) UHTTP::data_session = U_NEW(UDataSession);\n\t" : ""),
-                         (bstorage ? "\n\tif (UHTTP::data_storage == 0) UHTTP::data_storage = U_NEW(UDataSession);\n\t" : ""));
+                         (bsession ? "\n\tif (UHTTP::data_session == 0)   UHTTP::data_session = U_NEW(UDataSession);\n\t" : ""),
+                         (bstorage ? "\n\tif (UHTTP::data_storage == 0) { UHTTP::data_storage = U_NEW(UDataSession); UHTTP::data_storage->setKeyId(); }\n\t" : ""));

         (void) declaration.append(buffer);
         }
--- a/src/ulib/net/server/server.cpp
+++ b/src/ulib/net/server/server.cpp
@ -164,7 +164,7 @@ UVector<UIPAllow*>* UServer_Base::vallow_IP_prv;
 #ifdef ENABLE_THREAD
 #  include <ulib/thread.h>

-class UTimeThread : public UThread {
+class UTimeThread U_DECL_FINAL : public UThread {
 public:

   UTimeThread() : UThread(true, false) {}
@ -186,51 +186,47 @@ public:
         (void) U_SYSCALL(nanosleep, "%p,%p", &ts, 0);

 #     if defined(U_LOG_ENABLE) && defined(USE_LIBZ)
-         if (UServer_Base::log)             (void) UServer_Base::log->checkForLogRotateDataToWrite();
-         if (UServer_Base::apache_like_log) (void) UServer_Base::apache_like_log->checkForLogRotateDataToWrite();
+         if (UServer_Base::log)                         UServer_Base::log->checkForLogRotateDataToWrite();
+         if (UServer_Base::apache_like_log) UServer_Base::apache_like_log->checkForLogRotateDataToWrite();
 #     endif

         U_INTERNAL_DUMP("u_timeval.tv_sec = %ld u_now->tv_sec = %ld", u_timeval.tv_sec, u_now->tv_sec)

-         if (u_timeval.tv_sec == u_now->tv_sec)
+         (void) U_SYSCALL(gettimeofday, "%p,%p", u_now, 0);
+
+         if (u_timeval.tv_sec != u_now->tv_sec)
            {
-            (void) U_SYSCALL(gettimeofday, "%p,%p", u_now, 0);
+            u_timeval.tv_sec = u_now->tv_sec;

-            if (u_timeval.tv_sec == u_now->tv_sec) continue;
-            }
-
-         U_INTERNAL_ASSERT_DIFFERS(u_now->tv_sec, u_timeval.tv_sec)
-
-         u_timeval.tv_sec = u_now->tv_sec;
-
-         if (UServer_Base::update_date)
-            {
-#        if defined(U_LOG_ENABLE) && defined(USE_LIBZ)
-            (void) U_SYSCALL(pthread_rwlock_wrlock, "%p", ULog::prwlock);
-#        endif
-
-            if ((u_timeval.tv_sec % U_ONE_HOUR_IN_SECOND) != 0)
+            if (UServer_Base::update_date)
               {
-               if (UServer_Base::update_date1) UTimeDate::updateTime(ULog::ptr_shared_date->date1 + 12);
-               if (UServer_Base::update_date2) UTimeDate::updateTime(ULog::ptr_shared_date->date2 + 15);
-               if (UServer_Base::update_date3) UTimeDate::updateTime(ULog::ptr_shared_date->date3 + 26);
-               }
-            else
-               {
-               if (UServer_Base::update_date1) (void) u_strftime2(ULog::ptr_shared_date->date1,     17, "%d/%m/%y %T",     u_timeval.tv_sec + u_now_adjust);
-               if (UServer_Base::update_date2) (void) u_strftime2(ULog::ptr_shared_date->date2,   26-6, "%d/%b/%Y:%T",     u_timeval.tv_sec + u_now_adjust); // %z in general don't change...
-               if (UServer_Base::update_date3) (void) u_strftime2(ULog::ptr_shared_date->date3+6, 29-4, "%a, %d %b %Y %T", u_timeval.tv_sec);                // GMT can't change...
-               }
+#           if defined(U_LOG_ENABLE) && defined(USE_LIBZ)
+               (void) U_SYSCALL(pthread_rwlock_wrlock, "%p", ULog::prwlock);
+#           endif

-#        if defined(U_LOG_ENABLE) && defined(USE_LIBZ)
-            (void) U_SYSCALL(pthread_rwlock_unlock, "%p", ULog::prwlock);
-#        endif
+               if ((u_timeval.tv_sec % U_ONE_HOUR_IN_SECOND) != 0)
+                  {
+                  if (UServer_Base::update_date1) UTimeDate::updateTime(ULog::ptr_shared_date->date1 + 12);
+                  if (UServer_Base::update_date2) UTimeDate::updateTime(ULog::ptr_shared_date->date2 + 15);
+                  if (UServer_Base::update_date3) UTimeDate::updateTime(ULog::ptr_shared_date->date3 + 26);
+                  }
+               else
+                  {
+                  if (UServer_Base::update_date1) (void) u_strftime2(ULog::ptr_shared_date->date1,     17, "%d/%m/%y %T",     u_timeval.tv_sec + u_now_adjust);
+                  if (UServer_Base::update_date2) (void) u_strftime2(ULog::ptr_shared_date->date2,   26-6, "%d/%b/%Y:%T",     u_timeval.tv_sec + u_now_adjust); // %z  don't change...
+                  if (UServer_Base::update_date3) (void) u_strftime2(ULog::ptr_shared_date->date3+6, 29-4, "%a, %d %b %Y %T", u_timeval.tv_sec);                // GMT can't change...
+                  }
+
+#           if defined(U_LOG_ENABLE) && defined(USE_LIBZ)
+               (void) U_SYSCALL(pthread_rwlock_unlock, "%p", ULog::prwlock);
+#           endif
+               }
            }
         }
      }
 };

-class UClientThread : public UThread {
+class UClientThread U_DECL_FINAL : public UThread {
 public:

   UClientThread() : UThread(true, false) {}
@ -247,7 +243,7 @@ public:
 #include <ulib/net/tcpsocket.h>
 #include <ulib/net/client/client.h>

-class UOCSPStapling : public UThread {
+class UOCSPStapling U_DECL_FINAL : public UThread {
 public:

   UOCSPStapling() : UThread(true, false) {}
@ -1558,10 +1554,9 @@ void UServer_Base::init()
      U_INTERNAL_ASSERT_POINTER(ptr_shared_data)
      U_INTERNAL_ASSERT_EQUALS(ULog::ptr_shared_date, 0)

-                     u_now  = &(ptr_shared_data->now_shared);
-      ULog::ptr_shared_date = &(ptr_shared_data->log_date_shared);
+      *(u_now = &(ptr_shared_data->now_shared)) = u_timeval;

-      (void) U_SYSCALL(gettimeofday, "%p,%p", u_now, 0);
+      ULog::ptr_shared_date = &(ptr_shared_data->log_date_shared);

      U_MEMCPY(ULog::ptr_shared_date, &ULog::date, sizeof(ULog::log_date));
      }
--- a/src/ulib/utility/data_session.cpp
+++ b/src/ulib/utility/data_session.cpp
@ -69,22 +69,11 @@ UString UDataSession::setKeyIdDataSession(uint32_t counter)
   U_RETURN_STRING(keyid);
 }

-// define method VIRTUAL of class UDataStorage
-
-void UDataSession::clear()
-{
-   U_TRACE(0, "UDataSession::clear()")
-
-   vec_var->clear();
-}
-
 #ifdef U_STDCPP_ENABLE
 void UDataSession::toStream(ostream& os)
 {
   U_TRACE(0, "UDataSession::toStream(%p)", &os)

-   U_ASSERT(vec_var->empty())
-
   os.put('{');
   os.put(' ');
   os << creation;
--- a/src/ulib/utility/uhttp.cpp
+++ b/src/ulib/utility/uhttp.cpp
@ -1081,7 +1081,10 @@ next:

 #  ifdef DEBUG
      UDirWalk::setFollowLinks();
+
+      U_INTERNAL_ASSERT(u__strlen(U_LIB_SUFFIX, __PRETTY_FUNCTION__) >= 2)
 #  endif
+
      UDirWalk::setRecurseSubDirs();
      UDirWalk::setSuffixFileType(U_CONSTANT_TO_PARAM("usp|c|cgi|template|" U_LIB_SUFFIX));

@ -1124,6 +1127,10 @@ next:
      {
      item = vec[i];

+#  ifdef DEBUG
+      if (UStringExt::endsWith(item, U_CONSTANT_TO_PARAM(".usp.swp"))) continue;
+#  endif
+
      // NB: we can have duplication (symlink, cache_file_store)

      if (cache_file->at(U_STRING_TO_PARAM(item)))
@ -2922,40 +2929,92 @@ next:

 // manage dynamic page request (CGI - C/ULib Servlet Page - RUBY - PHP)

-bool UHTTP::checkIfSourceHasChangedAndCompileUSP(UServletPage* usp_page)
+bool UHTTP::checkIfSourceHasChangedAndCompileUSP()
 {
-   U_TRACE(1, "UHTTP::checkIfSourceHasChangedAndCompileUSP(%p)", usp_page)
+   U_TRACE(1, "UHTTP::checkIfSourceHasChangedAndCompileUSP()")

 #if defined(DEBUG) && !defined(U_STATIC_ONLY)
   checkForPathName();

-   U_INTERNAL_DUMP("pathname = %V file = %.*S", pathname->rep, U_FILE_TO_TRACE(*file))
+   UString suffix = file->getSuffix();
+
+   U_INTERNAL_DUMP("pathname = %V file = %.*S suffix = %V", pathname->rep, U_FILE_TO_TRACE(*file), suffix.rep)
+
+   const char* ptr  = file->getPathRelativ();
+   uint32_t sz, len = file->getPathRelativLen() - (sz = suffix.size());
+
+   U_INTERNAL_DUMP("ptr(%u) = %#.*S", len, len, ptr)
+
+   U_INTERNAL_ASSERT_MAJOR(len, 0)

-   struct stat st;
   char buffer[U_PATH_MAX];
-   uint32_t len = u__snprintf(buffer, sizeof(buffer), "%.*s.usp", U_FILE_TO_TRACE(*file));
+   char run_dynamic_page[128];
+   UServletPage* usp_page = (UServletPage*)file_data->ptr;

-   if (cache_file->at(buffer, len)                &&
-       U_SYSCALL(stat, "%S,%p", buffer, &st) == 0 &&
-       st.st_mtime > file->st_mtime)
+   if (suffix.empty())
      {
-      usp_page->UDynamic::close();
+      struct stat st;

-      usp_page->runDynamicPage = 0;
+      (void) u__snprintf(buffer, sizeof(buffer), "%.*s.usp", U_FILE_TO_TRACE(*file));

-      bool ko = (compileUSP(U_FILE_TO_PARAM(*file)) == false ||
-                 usp_page->UDynamic::load(buffer)   == false);
-
-      if (ko)
+      if (U_SYSCALL(stat, "%S,%p", buffer, &st) == 0 &&
+          st.st_mtime > file->st_mtime)
         {
-         setInternalError();
+         U_INTERNAL_ASSERT_POINTER(usp_page)

-         U_RETURN(false);
+         usp_page->UDynamic::close();
+
+         usp_page->runDynamicPage = 0;
+
+         // NB: dlopen() fail if the module name is not prefixed with "./"...
+
+         U_INTERNAL_ASSERT(u__strlen(U_LIB_SUFFIX, __PRETTY_FUNCTION__) >= 2)
+
+         (void) u__snprintf(buffer, sizeof(buffer), "./%.*s.%s", len, ptr, U_LIB_SUFFIX);
+
+         goto compile;
         }

-      usp_page->runDynamicPage = (vPFi)(*usp_page)["runDynamicPage"];
+      U_RETURN(true);
+      }

-      U_INTERNAL_ASSERT_POINTER(usp_page->runDynamicPage)
+   if (suffix.equal(U_CONSTANT_TO_PARAM("usp")))
+      {
+      if (U_HTTP_QUERY_STREQ("_nav_")) U_RETURN(false);
+
+      ++sz; // NB: we must avoid the point '.' before the suffix...
+
+      // NB: dlopen() fail if the module name is not prefixed with "./"...
+
+      U_INTERNAL_ASSERT(u__strlen(U_LIB_SUFFIX, __PRETTY_FUNCTION__) >= 2)
+
+      (void) u__snprintf(buffer, sizeof(buffer), "./%.*s%s", len, ptr, U_LIB_SUFFIX);
+
+      if (usp_page == 0)
+         {
+         usp_page = U_NEW(UHTTP::UServletPage);
+
+compile: if (compileUSP(ptr, len) == false)
+            {
+err:        setInternalError();
+
+            U_ClientImage_state = U_PLUGIN_HANDLER_ERROR;
+
+            U_RETURN(false);
+            }
+         }
+
+      if (usp_page->UDynamic::load(buffer) == false) goto err;
+
+      UString file_name = UStringExt::basename(file->getPath());
+
+      (void) u__snprintf(run_dynamic_page, sizeof(run_dynamic_page), "runDynamicPage_%.*s", file_name.size() - sz, file_name.data());
+
+      usp_page->runDynamicPage = (vPFi)(*usp_page)[run_dynamic_page];
+
+      if (usp_page->runDynamicPage == 0) goto err;
+
+      file_data->ptr = usp_page;
      }
 #endif

@ -3123,6 +3182,8 @@ U_NO_EXPORT bool UHTTP::callService()

   const char* psuffix = u_getsuffix(U_FILE_TO_PARAM(*file));

+   U_INTERNAL_ASSERT(u__strlen(U_LIB_SUFFIX, __PRETTY_FUNCTION__) >= 2)
+
   if (psuffix) pathname->snprintf("%.*s",    U_FILE_TO_TRACE(*file));
   else         pathname->snprintf("%.*s.%s", U_FILE_TO_TRACE(*file), U_LIB_SUFFIX);

@ -3727,15 +3788,15 @@ file_in_cache:

      if (u_is_usp(mime_index))
         {
+#     if defined(DEBUG) && !defined(U_STATIC_ONLY)
+         if (checkIfSourceHasChangedAndCompileUSP())
+#     endif
+         {
         UServletPage* usp_page = (UServletPage*)file_data->ptr;

         U_INTERNAL_ASSERT_POINTER(usp_page)
         U_INTERNAL_ASSERT_POINTER(usp_page->runDynamicPage)

-#     if defined(DEBUG) && !defined(U_STATIC_ONLY)
-         if (checkIfSourceHasChangedAndCompileUSP(usp_page))
-#     endif
-         {
         U_SET_MODULE_NAME(usp);

         usp_page->runDynamicPage(0);
@ -3743,8 +3804,12 @@ file_in_cache:
         if (U_ClientImage_parallelization != 2) setDynamicResponse(); // 2 => parent of parallelization

         U_RESET_MODULE_NAME;
+
+         U_RETURN(U_PLUGIN_HANDLER_FINISHED);
         }

+         if (U_ClientImage_state != U_PLUGIN_HANDLER_ERROR) goto from_cache;
+
         U_RETURN(U_PLUGIN_HANDLER_FINISHED);
         }

@ -3794,13 +3859,12 @@ file_in_cache:
         U_INTERNAL_DUMP("st_mode = %d st_size = %I st_mtime = %ld", file->st_mode, file->st_size, file->st_mtime)
         }

-      // NB: if we can't service the content of file directly from cache, set status to 'file exist and need to be processed'...
-
+from_cache:
      if (isGETorHEAD()      == false ||
          isDataFromCache()  == false ||
          processFileCache() == false)
         {
-file_exist_and_need_to_be_processed:
+file_exist_and_need_to_be_processed: // NB: if we can't service the content of file directly from cache, set status to 'file exist and need to be processed'...

         UClientImage_Base::setRequestNeedProcessing();
         }
@ -3961,14 +4025,14 @@ int UHTTP::processRequest()
      {
      // NB: may be we want a directory list...

-      /*
+#  ifndef DEBUG
      if (u_fnmatch(U_FILE_TO_PARAM(*file), U_CONSTANT_TO_PARAM("servlet"), 0))
         {
         setForbidden(); // set forbidden error response...
   
         U_RETURN(U_PLUGIN_HANDLER_FINISHED);
         }
-      */
+#  endif

      // Check if there is an index file (index.html) in the directory... (we check in the CACHE FILE SYSTEM)

@ -6915,15 +6979,17 @@ bool UHTTP::callInitForAllUSP(UStringRep* key, void* value)

   UHTTP::UFileCacheData* cptr = (UHTTP::UFileCacheData*)value;

-   if (cptr->link == false &&
+   if (cptr->ptr           &&
+       cptr->link == false &&
       cptr->mime_index == U_usp)
      {
      UServletPage* usp_page = (UServletPage*)cptr->ptr;

      U_INTERNAL_DUMP("usp_page->runDynamicPage = %p", usp_page->runDynamicPage)

-      U_INTERNAL_ASSERT_POINTER(usp_page->runDynamicPage)
-
+#  ifdef DEBUG
+      if (usp_page->runDynamicPage)
+#  endif
      usp_page->runDynamicPage(U_DPAGE_INIT);
      }

@ -6939,15 +7005,17 @@ bool UHTTP::callEndForAllUSP(UStringRep* key, void* value)

   UHTTP::UFileCacheData* cptr = (UHTTP::UFileCacheData*)value;

-   if (cptr->link == false &&
+   if (cptr->ptr           &&
+       cptr->link == false &&
       cptr->mime_index == U_usp)
      {
      UServletPage* usp_page = (UServletPage*)cptr->ptr;

      U_INTERNAL_DUMP("usp_page->runDynamicPage = %p", usp_page->runDynamicPage)

-      U_INTERNAL_ASSERT_POINTER(usp_page->runDynamicPage)
-
+#  ifdef DEBUG
+      if (usp_page->runDynamicPage)
+#  endif
      usp_page->runDynamicPage(U_DPAGE_DESTROY);
      }

@ -6963,15 +7031,17 @@ bool UHTTP::callResetForAllUSP(UStringRep* key, void* value)

   UHTTP::UFileCacheData* cptr = (UHTTP::UFileCacheData*)value;

-   if (cptr->link == false &&
+   if (cptr->ptr           &&
+       cptr->link == false &&
       cptr->mime_index == U_usp)
      {
      UServletPage* usp_page = (UServletPage*)cptr->ptr;

      U_INTERNAL_DUMP("usp_page->runDynamicPage = %p", usp_page->runDynamicPage)

-      U_INTERNAL_ASSERT_POINTER(usp_page->runDynamicPage)
-
+#  ifdef DEBUG
+      if (usp_page->runDynamicPage)
+#  endif
      usp_page->runDynamicPage(U_DPAGE_RESET);
      }

@ -6987,15 +7057,17 @@ bool UHTTP::callSigHUPForAllUSP(UStringRep* key, void* value)

   UHTTP::UFileCacheData* cptr = (UHTTP::UFileCacheData*)value;

-   if (cptr->link == false &&
+   if (cptr->ptr           &&
+       cptr->link == false &&
       cptr->mime_index == U_usp)
      {
      UServletPage* usp_page = (UServletPage*)cptr->ptr;

      U_INTERNAL_DUMP("usp_page->runDynamicPage = %p", usp_page->runDynamicPage)

-      U_INTERNAL_ASSERT_POINTER(usp_page->runDynamicPage)
-
+#  ifdef DEBUG
+      if (usp_page->runDynamicPage)
+#  endif
      usp_page->runDynamicPage(U_DPAGE_SIGHUP);
      }

@ -7011,15 +7083,17 @@ bool UHTTP::callAfterForkForAllUSP(UStringRep* key, void* value)

   UHTTP::UFileCacheData* cptr = (UHTTP::UFileCacheData*)value;

-   if (cptr->link == false &&
+   if (cptr->ptr           &&
+       cptr->link == false &&
       cptr->mime_index == U_usp)
      {
      UServletPage* usp_page = (UServletPage*)cptr->ptr;

      U_INTERNAL_DUMP("usp_page->runDynamicPage = %p", usp_page->runDynamicPage)

-      U_INTERNAL_ASSERT_POINTER(usp_page->runDynamicPage)
-
+#  ifdef DEBUG
+      if (usp_page->runDynamicPage)
+#  endif
      usp_page->runDynamicPage(U_DPAGE_FORK);
      }

@ -7073,7 +7147,8 @@ U_NO_EXPORT bool UHTTP::checkIfUSP(UStringRep* key, void* value)

   U_INTERNAL_DUMP("cptr->link = %b cptr->mime_index= %C", cptr->link, cptr->mime_index)

-   if (cptr->link == false &&
+   if (cptr->ptr           &&
+       cptr->link == false &&
       cptr->mime_index == U_usp)
      {
 #  ifdef DEBUG
@ -7121,6 +7196,8 @@ U_NO_EXPORT bool UHTTP::compileUSP(const char* path, uint32_t len)

   UString command(200U);

+   U_INTERNAL_ASSERT(u__strlen(U_LIB_SUFFIX, __PRETTY_FUNCTION__) >= 2)
+
   command.snprintf("usp_compile.sh %.*s %s", len, path, U_LIB_SUFFIX);

   UCommand cmd(command);
@ -7299,19 +7376,20 @@ U_NO_EXPORT void UHTTP::manageDataForCache()
      goto end;
      }

-   // NB: when a pathfile ends with "*.so|servlet/*.[usp|c|so|dll]" it is assumed to be a dynamic page...
+   // NB: when a pathfile ends with "*.[so|usp|c|dll]" it is assumed to be a dynamic page...

-   if (ptr                                                                                &&
-       (UServices::dosMatch(file_name,              U_CONSTANT_TO_PARAM("*.so"),       0) ||
-        UServices::dosMatch(U_FILE_TO_PARAM(*file), U_CONSTANT_TO_PARAM("*servlet/*"), 0)))
+   if (ptr &&
+       UServices::dosMatchWithOR(file_name, U_CONSTANT_TO_PARAM("*.so|*.usp|*.c|*.dll"), 0))
      {
-      uint32_t len;
+      uint32_t sz, len;
      char buffer[U_PATH_MAX];
      char run_dynamic_page[128];

      bool usp_dll = false,
           usp_src = suffix->equal(U_CONSTANT_TO_PARAM("usp"));

+      U_INTERNAL_ASSERT(u__strlen(U_LIB_SUFFIX, __PRETTY_FUNCTION__) >= 2)
+
      if ( usp_src ||
          (usp_dll = suffix->equal(U_CONSTANT_TO_PARAM(U_LIB_SUFFIX))))
         {
@ -7323,45 +7401,45 @@ U_NO_EXPORT void UHTTP::manageDataForCache()
         UServletPage* usp_page;

         ptr = file->getPathRelativ();
-         len = file->getPathRelativLen() - suffix->size();
+         len = file->getPathRelativLen()-(sz = suffix->size());

         U_INTERNAL_DUMP("ptr(%u) = %.*S", len, len, ptr)

         U_INTERNAL_ASSERT_MAJOR(len, 0)
+         U_INTERNAL_ASSERT(u__strlen(U_LIB_SUFFIX, __PRETTY_FUNCTION__) >= 2)

         (void) u__snprintf(buffer, sizeof(buffer), "%.*s%s", len, ptr, usp_dll ? "usp" : U_LIB_SUFFIX);

         exist = (U_SYSCALL(stat, "%S,%p", buffer, &st) == 0);

-         if (((usp_dll && ( exist && st.st_mtime > file->st_mtime))  ||
-              (usp_src && (!exist || st.st_mtime < file->st_mtime))) && compileUSP(ptr, len-1) == false)
+         if ((exist && getUSP(ptr, len-1))                            || // NB: check to avoid duplication...
+             (((usp_dll && ( exist && st.st_mtime > file->st_mtime))  ||
+               (usp_src && (!exist || st.st_mtime < file->st_mtime))) &&
+              compileUSP(ptr, len-1) == false))
            {
-            goto error;
+            goto check;
            }

-         // NB: check to avoid duplication...
+         // NB: dlopen() fail if the name of the module is not prefixed with "./"...

-         if (getUSP(ptr, len-1)) goto error;
+         U_INTERNAL_ASSERT(u__strlen(U_LIB_SUFFIX, __PRETTY_FUNCTION__) >= 2)

-         if (usp_dll)
-            {
-            // NB: dlopen() fail if the name is not prefixed with "./"...
-
-            (void) u__snprintf(buffer, sizeof(buffer), "./%.*s%s", len, ptr, U_LIB_SUFFIX);
-            }
+         (void) u__snprintf(buffer, sizeof(buffer), "./%.*s%s", len, ptr, U_LIB_SUFFIX);

         usp_page = U_NEW(UHTTP::UServletPage);

         if (usp_page->UDynamic::load(buffer) == false)
            {
-no_usp:     U_SRV_LOG("WARNING: USP load failed: %S", buffer);
+fail:       U_SRV_LOG("WARNING: USP load failed: %S", buffer);

            delete usp_page;

+check:      if (usp_src) goto end;
+
            goto error;
            }

-         (void) u__snprintf(run_dynamic_page, sizeof(run_dynamic_page), "runDynamicPage_%.*s", file_name.size()-suffix->size()-1,  file_name.data());
+         (void) u__snprintf(run_dynamic_page, sizeof(run_dynamic_page), "runDynamicPage_%.*s", file_name.size()-sz-1, file_name.data());

         usp_page->runDynamicPage = (vPFi)(*usp_page)[run_dynamic_page];

@ -7369,7 +7447,7 @@ no_usp:     U_SRV_LOG("WARNING: USP load failed: %S", buffer);
            {
            usp_page->UDynamic::close();

-            goto no_usp;
+            goto fail;
            }

         file_data->ptr        = usp_page;
@ -7381,7 +7459,7 @@ no_usp:     U_SRV_LOG("WARNING: USP load failed: %S", buffer);
         link = (cache_file->callForAllEntry(checkIfUSPLink), file_data->link) ? " (link)" : "";
 #     endif

-         (void) pathname->replace(buffer + (usp_dll ? 2 : 0), len-1);
+         (void) pathname->replace(buffer+2, len-1);

         U_SRV_LOG("USP found: %S%s, USP service registered (URI): %V", buffer, link, pathname->rep);

@ -7829,14 +7907,15 @@ nocontent:

         if (*suffix)
            {
-            if (suffix->equal(U_CONSTANT_TO_PARAM("usp")))
-               {
-               UClientImage_Base::setRequestNeedProcessing();
-
-               return;
-               }
+            U_INTERNAL_ASSERT(u__strlen(U_LIB_SUFFIX, __PRETTY_FUNCTION__) >= 2)

            if (suffix->equal(U_CONSTANT_TO_PARAM(U_LIB_SUFFIX))) goto nocontent;
+
+            if (U_HTTP_QUERY_STREQ("_nav_") &&
+                suffix->equal(U_CONSTANT_TO_PARAM("usp")))
+               {
+               UClientImage_Base::setRequestNeedProcessing();
+               }
            }

         (void) pathname->replace(U_FILE_TO_PARAM(*file));
--- a/tests/ulib/plugin/.deps/product1.Plo
+++ b/tests/ulib/plugin/.deps/product1.Plo
@ -8,14 +8,14 @@ plugin/product1.lo: plugin/product1.cpp /usr/include/stdc-predef.h \
 /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
 /usr/include/gnu/stubs-64.h /usr/include/bits/types.h \
 /usr/include/bits/typesizes.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stddef.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stddef.h \
 /usr/include/bits/mman.h /usr/include/bits/mman-linux.h \
 /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
 /usr/include/wchar.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stdarg.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stdarg.h \
 /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
 /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stdint.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stdint.h \
 /usr/include/stdint.h /usr/include/bits/wchar.h /usr/include/unistd.h \
 /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
 /usr/include/bits/confname.h /usr/include/getopt.h \
@ -43,108 +43,108 @@ plugin/product1.lo: plugin/product1.cpp /usr/include/stdc-predef.h \
 /usr/include/bits/string3.h /usr/include/fcntl.h \
 /usr/include/bits/fcntl.h /usr/include/bits/fcntl-linux.h \
 /usr/include/bits/fcntl2.h /usr/include/sys/time.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include-fixed/limits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include-fixed/syslimits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include-fixed/limits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include-fixed/syslimits.h \
 /usr/include/limits.h /usr/include/bits/posix1_lim.h \
 /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
 /usr/include/bits/posix2_lim.h /usr/include/bits/xopen_lim.h \
 ../../include/ulib/base/color.h ../../include/ulib/base/macro.h \
 /usr/include/zlib.h /usr/include/zconf.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/iostream \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++config.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/os_defines.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/cpu_defines.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ostream \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ios \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/iosfwd \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stringfwd.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/memoryfwd.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/postypes.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cwchar \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/iostream \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++config.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/os_defines.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/cpu_defines.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ostream \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ios \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/iosfwd \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stringfwd.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/memoryfwd.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/postypes.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cwchar \
 /usr/include/bits/wchar2.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/exception \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/atomic_lockfree_defines.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/exception_ptr.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/exception_defines.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/nested_exception.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/char_traits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_algobase.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/functexcept.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/cpp_type_traits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/type_traits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/numeric_traits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_pair.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/move.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/concept_check.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/type_traits \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_iterator_base_types.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_iterator_base_funcs.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/debug/debug.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_iterator.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ptr_traits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/predefined_ops.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cstdint \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/localefwd.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++locale.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/clocale \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/exception \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/atomic_lockfree_defines.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/exception_ptr.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/exception_defines.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/nested_exception.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/char_traits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_algobase.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/functexcept.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/cpp_type_traits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/type_traits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/numeric_traits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_pair.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/move.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/concept_check.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/type_traits \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_iterator_base_types.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_iterator_base_funcs.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/debug/debug.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_iterator.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ptr_traits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/predefined_ops.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cstdint \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/localefwd.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++locale.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/clocale \
 /usr/include/locale.h /usr/include/bits/locale.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cctype \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ios_base.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/atomicity.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr-default.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/atomic_word.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_classes.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/string \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/allocator.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++allocator.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/new_allocator.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/new \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ostream_insert.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/cxxabi_forced.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_function.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/backward/binders.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/range_access.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/initializer_list \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_string.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/alloc_traits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/alloc_traits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/string_conversions.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cstdlib \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cstdio \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cerrno \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cctype \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ios_base.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/atomicity.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr-default.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/atomic_word.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_classes.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/string \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/allocator.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++allocator.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/new_allocator.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/new \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ostream_insert.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/cxxabi_forced.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_function.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/backward/binders.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/range_access.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/initializer_list \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_string.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/alloc_traits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/alloc_traits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/string_conversions.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cstdlib \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cstdio \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cerrno \
 /usr/include/errno.h /usr/include/bits/errno.h \
 /usr/include/linux/errno.h /usr/include/asm/errno.h \
 /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/functional_hash.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/hash_bytes.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_string.tcc \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_classes.tcc \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/system_error \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/error_constants.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/stdexcept \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/streambuf \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/streambuf.tcc \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_ios.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_facets.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cwctype \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/functional_hash.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/hash_bytes.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_string.tcc \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_classes.tcc \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/system_error \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/error_constants.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/stdexcept \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/streambuf \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/streambuf.tcc \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_ios.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_facets.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cwctype \
 /usr/include/wctype.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_base.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/streambuf_iterator.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_inline.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_facets.tcc \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_ios.tcc \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ostream.tcc \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/istream \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/istream.tcc \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_base.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/streambuf_iterator.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_inline.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_facets.tcc \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_ios.tcc \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ostream.tcc \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/istream \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/istream.tcc \
 ../../include/ulib/replace/strstream.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/backward/strstream \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/backward/backward_warning.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/backward/strstream \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/backward/backward_warning.h \
 ../../include/ulib/debug/macro.h ../../include/ulib/debug/trace.h \
 ../../include/ulib/base/trace.h ../../include/ulib/base/utility.h \
 /usr/include/dirent.h /usr/include/bits/dirent.h /usr/include/fnmatch.h \
 ../../include/ulib/debug/error_simulation.h /usr/include/tdb.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stdbool.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stdbool.h \
 ../../include/ulib/debug/common.h ../../include/ulib/debug/error.h \
 ../../include/ulib/debug/error_memory.h \
 ../../include/ulib/debug/objectDB.h \
@ -187,7 +187,7 @@ plugin/product.h:

 /usr/include/bits/typesizes.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stddef.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stddef.h:

 /usr/include/bits/mman.h:

@ -201,7 +201,7 @@ plugin/product.h:

 /usr/include/wchar.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stdarg.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stdarg.h:

 /usr/include/bits/stdio_lim.h:

@ -211,7 +211,7 @@ plugin/product.h:

 /usr/include/bits/stdio2.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stdint.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stdint.h:

 /usr/include/stdint.h:

@ -327,9 +327,9 @@ plugin/product.h:

 /usr/include/sys/time.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include-fixed/limits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include-fixed/limits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include-fixed/syslimits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include-fixed/syslimits.h:

 /usr/include/limits.h:

@ -351,133 +351,133 @@ plugin/product.h:

 /usr/include/zconf.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/iostream:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/iostream:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++config.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++config.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/os_defines.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/os_defines.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/cpu_defines.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/cpu_defines.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ostream:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ostream:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ios:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ios:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/iosfwd:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/iosfwd:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stringfwd.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stringfwd.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/memoryfwd.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/memoryfwd.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/postypes.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/postypes.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cwchar:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cwchar:

 /usr/include/bits/wchar2.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/exception:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/exception:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/atomic_lockfree_defines.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/atomic_lockfree_defines.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/exception_ptr.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/exception_ptr.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/exception_defines.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/exception_defines.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/nested_exception.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/nested_exception.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/char_traits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/char_traits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_algobase.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_algobase.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/functexcept.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/functexcept.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/cpp_type_traits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/cpp_type_traits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/type_traits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/type_traits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/numeric_traits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/numeric_traits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_pair.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_pair.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/move.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/move.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/concept_check.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/concept_check.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/type_traits:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/type_traits:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_iterator_base_types.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_iterator_base_types.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_iterator_base_funcs.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_iterator_base_funcs.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/debug/debug.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/debug/debug.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_iterator.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_iterator.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ptr_traits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ptr_traits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/predefined_ops.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/predefined_ops.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cstdint:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cstdint:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/localefwd.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/localefwd.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++locale.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++locale.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/clocale:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/clocale:

 /usr/include/locale.h:

 /usr/include/bits/locale.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cctype:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cctype:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ios_base.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ios_base.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/atomicity.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/atomicity.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr-default.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr-default.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/atomic_word.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/atomic_word.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_classes.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_classes.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/string:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/string:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/allocator.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/allocator.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++allocator.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++allocator.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/new_allocator.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/new_allocator.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/new:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/new:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ostream_insert.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ostream_insert.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/cxxabi_forced.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/cxxabi_forced.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_function.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_function.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/backward/binders.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/backward/binders.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/range_access.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/range_access.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/initializer_list:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/initializer_list:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_string.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_string.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/alloc_traits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/alloc_traits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/alloc_traits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/alloc_traits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/string_conversions.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/string_conversions.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cstdlib:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cstdlib:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cstdio:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cstdio:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cerrno:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cerrno:

 /usr/include/errno.h:

@ -491,53 +491,53 @@ plugin/product.h:

 /usr/include/asm-generic/errno-base.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/functional_hash.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/functional_hash.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/hash_bytes.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/hash_bytes.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_string.tcc:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_string.tcc:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_classes.tcc:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_classes.tcc:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/system_error:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/system_error:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/error_constants.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/error_constants.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/stdexcept:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/stdexcept:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/streambuf:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/streambuf:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/streambuf.tcc:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/streambuf.tcc:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_ios.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_ios.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_facets.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_facets.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cwctype:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cwctype:

 /usr/include/wctype.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_base.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_base.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/streambuf_iterator.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/streambuf_iterator.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_inline.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_inline.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_facets.tcc:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_facets.tcc:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_ios.tcc:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_ios.tcc:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ostream.tcc:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ostream.tcc:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/istream:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/istream:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/istream.tcc:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/istream.tcc:

 ../../include/ulib/replace/strstream.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/backward/strstream:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/backward/strstream:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/backward/backward_warning.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/backward/backward_warning.h:

 ../../include/ulib/debug/macro.h:

@ -557,7 +557,7 @@ plugin/product.h:

 /usr/include/tdb.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stdbool.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stdbool.h:

 ../../include/ulib/debug/common.h:

--- a/tests/ulib/plugin/.deps/product2.Plo
+++ b/tests/ulib/plugin/.deps/product2.Plo
@ -8,14 +8,14 @@ plugin/product2.lo: plugin/product2.cpp /usr/include/stdc-predef.h \
 /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
 /usr/include/gnu/stubs-64.h /usr/include/bits/types.h \
 /usr/include/bits/typesizes.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stddef.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stddef.h \
 /usr/include/bits/mman.h /usr/include/bits/mman-linux.h \
 /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
 /usr/include/wchar.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stdarg.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stdarg.h \
 /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
 /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stdint.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stdint.h \
 /usr/include/stdint.h /usr/include/bits/wchar.h /usr/include/unistd.h \
 /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
 /usr/include/bits/confname.h /usr/include/getopt.h \
@ -43,108 +43,108 @@ plugin/product2.lo: plugin/product2.cpp /usr/include/stdc-predef.h \
 /usr/include/bits/string3.h /usr/include/fcntl.h \
 /usr/include/bits/fcntl.h /usr/include/bits/fcntl-linux.h \
 /usr/include/bits/fcntl2.h /usr/include/sys/time.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include-fixed/limits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include-fixed/syslimits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include-fixed/limits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include-fixed/syslimits.h \
 /usr/include/limits.h /usr/include/bits/posix1_lim.h \
 /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
 /usr/include/bits/posix2_lim.h /usr/include/bits/xopen_lim.h \
 ../../include/ulib/base/color.h ../../include/ulib/base/macro.h \
 /usr/include/zlib.h /usr/include/zconf.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/iostream \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++config.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/os_defines.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/cpu_defines.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ostream \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ios \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/iosfwd \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stringfwd.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/memoryfwd.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/postypes.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cwchar \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/iostream \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++config.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/os_defines.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/cpu_defines.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ostream \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ios \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/iosfwd \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stringfwd.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/memoryfwd.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/postypes.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cwchar \
 /usr/include/bits/wchar2.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/exception \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/atomic_lockfree_defines.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/exception_ptr.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/exception_defines.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/nested_exception.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/char_traits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_algobase.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/functexcept.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/cpp_type_traits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/type_traits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/numeric_traits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_pair.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/move.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/concept_check.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/type_traits \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_iterator_base_types.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_iterator_base_funcs.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/debug/debug.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_iterator.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ptr_traits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/predefined_ops.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cstdint \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/localefwd.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++locale.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/clocale \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/exception \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/atomic_lockfree_defines.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/exception_ptr.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/exception_defines.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/nested_exception.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/char_traits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_algobase.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/functexcept.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/cpp_type_traits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/type_traits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/numeric_traits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_pair.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/move.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/concept_check.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/type_traits \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_iterator_base_types.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_iterator_base_funcs.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/debug/debug.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_iterator.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ptr_traits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/predefined_ops.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cstdint \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/localefwd.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++locale.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/clocale \
 /usr/include/locale.h /usr/include/bits/locale.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cctype \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ios_base.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/atomicity.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr-default.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/atomic_word.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_classes.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/string \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/allocator.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++allocator.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/new_allocator.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/new \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ostream_insert.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/cxxabi_forced.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_function.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/backward/binders.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/range_access.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/initializer_list \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_string.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/alloc_traits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/alloc_traits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/string_conversions.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cstdlib \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cstdio \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cerrno \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cctype \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ios_base.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/atomicity.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr-default.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/atomic_word.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_classes.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/string \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/allocator.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++allocator.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/new_allocator.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/new \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ostream_insert.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/cxxabi_forced.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_function.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/backward/binders.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/range_access.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/initializer_list \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_string.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/alloc_traits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/alloc_traits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/string_conversions.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cstdlib \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cstdio \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cerrno \
 /usr/include/errno.h /usr/include/bits/errno.h \
 /usr/include/linux/errno.h /usr/include/asm/errno.h \
 /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/functional_hash.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/hash_bytes.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_string.tcc \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_classes.tcc \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/system_error \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/error_constants.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/stdexcept \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/streambuf \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/streambuf.tcc \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_ios.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_facets.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cwctype \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/functional_hash.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/hash_bytes.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_string.tcc \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_classes.tcc \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/system_error \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/error_constants.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/stdexcept \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/streambuf \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/streambuf.tcc \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_ios.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_facets.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cwctype \
 /usr/include/wctype.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_base.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/streambuf_iterator.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_inline.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_facets.tcc \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_ios.tcc \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ostream.tcc \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/istream \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/istream.tcc \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_base.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/streambuf_iterator.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_inline.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_facets.tcc \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_ios.tcc \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ostream.tcc \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/istream \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/istream.tcc \
 ../../include/ulib/replace/strstream.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/backward/strstream \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/backward/backward_warning.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/backward/strstream \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/backward/backward_warning.h \
 ../../include/ulib/debug/macro.h ../../include/ulib/debug/trace.h \
 ../../include/ulib/base/trace.h ../../include/ulib/base/utility.h \
 /usr/include/dirent.h /usr/include/bits/dirent.h /usr/include/fnmatch.h \
 ../../include/ulib/debug/error_simulation.h /usr/include/tdb.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stdbool.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stdbool.h \
 ../../include/ulib/debug/common.h ../../include/ulib/debug/error.h \
 ../../include/ulib/debug/error_memory.h \
 ../../include/ulib/debug/objectDB.h \
@ -187,7 +187,7 @@ plugin/product.h:

 /usr/include/bits/typesizes.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stddef.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stddef.h:

 /usr/include/bits/mman.h:

@ -201,7 +201,7 @@ plugin/product.h:

 /usr/include/wchar.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stdarg.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stdarg.h:

 /usr/include/bits/stdio_lim.h:

@ -211,7 +211,7 @@ plugin/product.h:

 /usr/include/bits/stdio2.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stdint.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stdint.h:

 /usr/include/stdint.h:

@ -327,9 +327,9 @@ plugin/product.h:

 /usr/include/sys/time.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include-fixed/limits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include-fixed/limits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include-fixed/syslimits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include-fixed/syslimits.h:

 /usr/include/limits.h:

@ -351,133 +351,133 @@ plugin/product.h:

 /usr/include/zconf.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/iostream:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/iostream:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++config.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++config.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/os_defines.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/os_defines.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/cpu_defines.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/cpu_defines.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ostream:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ostream:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ios:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ios:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/iosfwd:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/iosfwd:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stringfwd.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stringfwd.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/memoryfwd.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/memoryfwd.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/postypes.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/postypes.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cwchar:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cwchar:

 /usr/include/bits/wchar2.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/exception:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/exception:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/atomic_lockfree_defines.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/atomic_lockfree_defines.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/exception_ptr.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/exception_ptr.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/exception_defines.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/exception_defines.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/nested_exception.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/nested_exception.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/char_traits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/char_traits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_algobase.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_algobase.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/functexcept.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/functexcept.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/cpp_type_traits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/cpp_type_traits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/type_traits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/type_traits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/numeric_traits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/numeric_traits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_pair.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_pair.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/move.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/move.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/concept_check.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/concept_check.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/type_traits:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/type_traits:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_iterator_base_types.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_iterator_base_types.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_iterator_base_funcs.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_iterator_base_funcs.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/debug/debug.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/debug/debug.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_iterator.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_iterator.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ptr_traits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ptr_traits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/predefined_ops.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/predefined_ops.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cstdint:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cstdint:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/localefwd.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/localefwd.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++locale.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++locale.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/clocale:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/clocale:

 /usr/include/locale.h:

 /usr/include/bits/locale.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cctype:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cctype:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ios_base.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ios_base.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/atomicity.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/atomicity.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr-default.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/gthr-default.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/atomic_word.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/atomic_word.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_classes.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_classes.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/string:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/string:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/allocator.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/allocator.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++allocator.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/c++allocator.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/new_allocator.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/new_allocator.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/new:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/new:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ostream_insert.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ostream_insert.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/cxxabi_forced.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/cxxabi_forced.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/stl_function.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/stl_function.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/backward/binders.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/backward/binders.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/range_access.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/range_access.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/initializer_list:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/initializer_list:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_string.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_string.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/alloc_traits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/alloc_traits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/alloc_traits.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/alloc_traits.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/ext/string_conversions.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/ext/string_conversions.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cstdlib:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cstdlib:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cstdio:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cstdio:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cerrno:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cerrno:

 /usr/include/errno.h:

@ -491,53 +491,53 @@ plugin/product.h:

 /usr/include/asm-generic/errno-base.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/functional_hash.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/functional_hash.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/hash_bytes.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/hash_bytes.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_string.tcc:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_string.tcc:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_classes.tcc:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_classes.tcc:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/system_error:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/system_error:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/error_constants.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/error_constants.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/stdexcept:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/stdexcept:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/streambuf:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/streambuf:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/streambuf.tcc:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/streambuf.tcc:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_ios.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_ios.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_facets.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_facets.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/cwctype:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/cwctype:

 /usr/include/wctype.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_base.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_base.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/streambuf_iterator.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/streambuf_iterator.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_inline.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/x86_64-pc-linux-gnu/bits/ctype_inline.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/locale_facets.tcc:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/locale_facets.tcc:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/basic_ios.tcc:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/basic_ios.tcc:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/ostream.tcc:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/ostream.tcc:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/istream:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/istream:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/bits/istream.tcc:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/bits/istream.tcc:

 ../../include/ulib/replace/strstream.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/backward/strstream:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/backward/strstream:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/g++-v5/backward/backward_warning.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/g++-v5/backward/backward_warning.h:

 ../../include/ulib/debug/macro.h:

@ -557,7 +557,7 @@ plugin/product.h:

 /usr/include/tdb.h:

-/usr/lib/gcc/x86_64-pc-linux-gnu/5.1.0/include/stdbool.h:
+/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/include/stdbool.h:

 ../../include/ulib/debug/common.h: