From ab10ed245ca5a4f2b2b8134b2001b5b747571119 Mon Sep 17 00:00:00 2001
From: bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 22 Feb 2006 02:26:47 +0000
Subject: [PATCH] 2006-02-21 Benjamin Kosnik <bkoz@redhat.com>
* include/c_std/cmath.tcc: Use _GLIBCXX_BEGIN_NAMESPACE,
_GLIBCXX_END_NAMESPACE.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111357 138bc75d-0d04-0410-961f-82ee72b054a4
---
libstdc++-v3/ChangeLog | 5 +++++
libstdc++-v3/include/c_std/cmath.tcc | 9 +++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c02ac6ff9b63..39f58d4db595 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-21 Benjamin Kosnik <bkoz@redhat.com>
+
+ * include/c_std/cmath.tcc: Use _GLIBCXX_BEGIN_NAMESPACE,
+ _GLIBCXX_END_NAMESPACE.
+
2006-02-21 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/c++config: Simplify debug namespaces.
diff --git a/libstdc++-v3/include/c_std/cmath.tcc b/libstdc++-v3/include/c_std/cmath.tcc
index 737b58c7de92..b2df1be0bd15 100644
--- a/libstdc++-v3/include/c_std/cmath.tcc
+++ b/libstdc++-v3/include/c_std/cmath.tcc
@@ -1,6 +1,6 @@
// -*- C++ -*- C math library.
-// Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2003, 2004, 2006 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
@@ -32,8 +32,8 @@
#ifndef _GLIBCXX_CMATH_TCC
#define _GLIBCXX_CMATH_TCC 1
-namespace std
-{
+_GLIBCXX_BEGIN_NAMESPACE(std)
+
template<typename _Tp>
inline _Tp
__cmath_power(_Tp __x, unsigned int __n)
@@ -49,6 +49,7 @@ namespace std
return __y;
}
-}
+
+_GLIBCXX_END_NAMESPACE
#endif
--
GitLab