ICU 56 update step 1

source/common/putilimp.h

 /*
 ******************************************************************************
 *
 *   Copyright (C) 1997-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *
 *  FILE NAME : putilimp.h
 *
@@ skipping 194 matching lines @@
 
 /**
  * \def U_HAVE_STD_ATOMICS
  * Defines whether the standard C++11 <atomic> is available.
  * ICU will use this when avialable,
  * otherwise will fall back to compiler or platform specific alternatives.
  * @internal
  */
 #ifdef U_HAVE_STD_ATOMICS
     /* Use the predefined value. */
-#elif !defined(__cplusplus) || __cplusplus<201103L
+#elif U_CPLUSPLUS_VERSION < 11
     /* Not C++11, disable use of atomics */
 #   define U_HAVE_STD_ATOMICS 0
 #elif __clang__ && __clang_major__==3 && __clang_minor__<=1
     /* Clang 3.1, has atomic variable initializer bug. */
 #   define U_HAVE_STD_ATOMICS 0
 #else 
     /* U_HAVE_ATOMIC is typically set by an autoconf test of #include <atomic>  */
     /*   Can be set manually, or left undefined, on platforms without autoconf. */
 #   if defined(U_HAVE_ATOMIC) &&  U_HAVE_ATOMIC 
 #      define U_HAVE_STD_ATOMICS 1
 #   else
 #      define U_HAVE_STD_ATOMICS 0
 #   endif
 #endif
 
 
 /**
  *  \def U_HAVE_CLANG_ATOMICS
  *  Defines whether Clang c11 style built-in atomics are avaialable.
  *  These are used in preference to gcc atomics when both are available.
  */
 #ifdef U_HAVE_CLANG_ATOMICS
     /* Use the predefined value. */
-#elif !defined(__clang__)
-#    define U_HAVE_CLANG_ATOMICS 0
-#else
-#if __has_builtin(__c11_atomic_load) && \
+#elif __has_builtin(__c11_atomic_load) && \
     __has_builtin(__c11_atomic_store) && \
     __has_builtin(__c11_atomic_fetch_add) && \
     __has_builtin(__c11_atomic_fetch_sub)
 #    define U_HAVE_CLANG_ATOMICS 1
 #else
 #    define U_HAVE_CLANG_ATOMICS 0
 #endif
-#endif
-
-/*===========================================================================*/
-/** @{ Code alignment                                                        */
-/*===========================================================================*/
-
-/**
- * \def U_ALIGN_CODE
- * This is used to align code fragments to a specific byte boundary.
- * This is useful for getting consistent performance test results.
- * @internal
- */
-#ifdef U_ALIGN_CODE
-    /* Use the predefined value. */
-#elif defined(_MSC_VER) && defined(_M_IX86) && !defined(_MANAGED)
-#   define U_ALIGN_CODE(boundarySize) __asm  align boundarySize
-#else
-#   define U_ALIGN_CODE(boundarySize) 
-#endif
-
-/** @} */
 
 /*===========================================================================*/
 /** @{ Programs used by ICU code                                             */
 /*===========================================================================*/
 
 /**
  * \def U_MAKE_IS_NMAKE
  * Defines whether the "make" program is Windows nmake.
  */
 #ifdef U_MAKE_IS_NMAKE
@@ skipping 215 matching lines @@
  *   tzname(0)  Three-letter time-zone name derived from TZ environment
  *              variable. E.g., "PST".
  *   tzname(1)  Three-letter DST zone name derived from TZ environment
  *              variable.  E.g., "PDT". If DST zone is omitted from TZ,
  *              tzname(1) is an empty string.
  * @internal
  */
 U_INTERNAL const char* U_EXPORT2 uprv_tzname(int n);
 
 /**
- * Reset the global tzname cache.
- * @internal
- */
-U_INTERNAL void uprv_tzname_clear_cache();
-
-/**
  * Get UTC (GMT) time measured in milliseconds since 0:00 on 1/1/1970.
  * This function is affected by 'faketime' and should be the bottleneck for all user-visible ICU time functions.
  * @return the UTC time measured in milliseconds
  * @internal
  */
 U_INTERNAL UDate U_EXPORT2 uprv_getUTCtime(void);
 
 /**
  * Get UTC (GMT) time measured in milliseconds since 0:00 on 1/1/1970.
  * This function is not affected by 'faketime', so it should only be used by low level test functions- not by anything that
@@ skipping 106 matching lines @@
 /* also _C_TS_calloc(x) */
 #else
 /* C defaults */
 # define uprv_default_malloc(x) malloc(x)
 # define uprv_default_realloc(x,y) realloc(x,y)
 # define uprv_default_free(x) free(x)
 #endif
 
 
 #endif