OSDN Git Service
(root)
/
pf3gnuchains
/
gcc-fork.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Daily bump.
[pf3gnuchains/gcc-fork.git]
/
libstdc++-v3
/
include
/
bits
/
c++config
diff --git
a/libstdc++-v3/include/bits/c++config
b/libstdc++-v3/include/bits/c++config
index
37d38c3
..
7c5f6c2
100644
(file)
--- a/
libstdc++-v3/include/bits/c++config
+++ b/
libstdc++-v3/include/bits/c++config
@@
-1,6
+1,6
@@
// Predefined symbols and macros -*- C++ -*-
// Predefined symbols and macros -*- C++ -*-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
, 2004
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@
-35,7
+35,7
@@
#include <bits/os_defines.h>
// The current version of the C++ library in compressed ISO date format.
#include <bits/os_defines.h>
// The current version of the C++ library in compressed ISO date format.
-#define __GLIBCXX__ 20040
308
+#define __GLIBCXX__ 20040
525
// Allow use of "export template." This is currently not a feature
// that g++ supports.
// Allow use of "export template." This is currently not a feature
// that g++ supports.
@@
-51,27
+51,30
@@
# define _GLIBCXX_EXTERN_TEMPLATE 1
#endif
# define _GLIBCXX_EXTERN_TEMPLATE 1
#endif
-// To enable debug mode.
-namespace __gnu_norm
-{
- using namespace std;
-}
-
+// Debug mode support. Debug mode basic_string is not allowed to be
+// associated with std, because of locale and exception link
+// dependence.
namespace __gnu_debug_def { }
namespace __gnu_debug
{
namespace __gnu_debug_def { }
namespace __gnu_debug
{
- using namespace __gnu_debug_def
__attribute__ ((strong))
;
+ using namespace __gnu_debug_def;
}
}
+#ifdef _GLIBCXX_DEBUG
+# define _GLIBCXX_STD __gnu_norm
+namespace __gnu_norm
+{
+ using namespace std;
+}
namespace std
{
namespace std
{
-#ifdef _GLIBCXX_DEBUG
using namespace __gnu_debug_def __attribute__ ((strong));
using namespace __gnu_debug_def __attribute__ ((strong));
+}
#else
#else
- using namespace __gnu_norm __attribute__ ((strong));
+# define _GLIBCXX_STD std
#endif
#endif
-}
+
// The remainder of the prewritten config is automatic; all the
// user hooks are listed above.
// The remainder of the prewritten config is automatic; all the
// user hooks are listed above.