Update copyright years.

[thirdparty/gcc.git] / libstdc++-v3 / include / ext / pod_char_traits.h

diff --git a/libstdc++-v3/include/ext/pod_char_traits.h b/libstdc++-v3/include/ext/pod_char_traits.h
index e027585e704f32138dafec9bd61ecb354cf41cd3..9f3bee80667246b39a0280b6788751ec5853b8f5 100644 (file)
--- a/libstdc++-v3/include/ext/pod_char_traits.h
+++ b/libstdc++-v3/include/ext/pod_char_traits.h
@@ -1,6 +1,6 @@
 // POD character, std::char_traits specialization -*- C++ -*-
 
-// Copyright (C) 2002-2014 Free Software Foundation, Inc.
+// Copyright (C) 2002-2017 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -144,6 +144,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       static char_type*
       move(char_type* __s1, const char_type* __s2, size_t __n)
       { 
+       if (__n == 0)
+         return __s1;
        return static_cast<char_type*>
          (__builtin_memmove(__s1, __s2, __n * sizeof(char_type)));
       }
@@ -151,6 +153,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       static char_type*
       copy(char_type* __s1, const char_type* __s2, size_t __n)
       {
+       if (__n == 0)
+         return __s1;
        std::copy(__s2, __s2 + __n, __s1);
        return __s1;
       }
@@ -177,7 +181,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       static int_type
       eof() 
       {
-       int_type __r = { -1 };
+       int_type __r = { static_cast<typename __gnu_cxx::__conditional_type
+                        <std::__is_integer<int_type>::__value,
+                        int_type, int>::__type>(-1) };
        return __r;
       }