X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Finclude%2Fc_std%2Fcmath.tcc;fp=libstdc%2B%2B-v3%2Finclude%2Fc_std%2Fcmath.tcc;h=9f4c853a8eab61452a7703681a8f8acca52f54bd;hb=6fed43773c9b0ce596dca5686f37ac3fc0fa11c0;hp=9b86bbb9da6f340cecbada837fd773c3d1cd1b73;hpb=27b11d56b743098deb193d510b337ba22dc52e5c;p=msp430-gcc.git

diff --git a/libstdc++-v3/include/c_std/cmath.tcc b/libstdc++-v3/include/c_std/cmath.tcc
index 9b86bbb9..9f4c853a 100644
--- a/libstdc++-v3/include/c_std/cmath.tcc
+++ b/libstdc++-v3/include/c_std/cmath.tcc
@@ -1,11 +1,12 @@
 // -*- C++ -*- C math library.
 
-// Copyright (C) 2000 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
+// 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
 // terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
+// Free Software Foundation; either version 3, or (at your option)
 // any later version.
 
 // This library is distributed in the hope that it will be useful,
@@ -13,32 +14,31 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
 
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
 
 // This file was written by Gabriel Dos Reis <gdr@codesourcery.com>
 
-#ifndef _CPP_BITS_CMATH_TCC
-#define _CPP_BITS_CMATH_TCC 1
+/** @file cmath.tcc
+ *  This is a Standard C++ Library file.
+ */
 
-namespace std 
-{
-  export template<typename _Tp>
-    _Tp
+#ifndef _GLIBCXX_CMATH_TCC
+#define _GLIBCXX_CMATH_TCC 1
+
+_GLIBCXX_BEGIN_NAMESPACE(std)
+
+  template<typename _Tp>
+    inline _Tp
     __cmath_power(_Tp __x, unsigned int __n)
     {
-      _Tp __y = __n % 2 ? __x : 1;
+      _Tp __y = __n % 2 ? __x : _Tp(1);
 
       while (__n >>= 1)
         {
@@ -49,6 +49,7 @@ namespace std
 
       return __y;
     }
-}
+
+_GLIBCXX_END_NAMESPACE
 
 #endif