OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c++config: Consistent macro guards for config includes.

Browse Source 
2007-02-02  Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/c++config: Consistent macro guards for config includes.
	* config/locale/gnu/c_locale.h: Same.
	* config/locale/generic/c_locale.h: Same.
	* config/allocator/mt_allocator_base.h: Same.
	* config/allocator/malloc_allocator_base.h: Same.
	* config/allocator/new_allocator_base.h: Same.
	* config/allocator/pool_allocator_base.h: Same.
	* config/allocator/bitmap_allocator_base.h: Same.
	* config/os/vxworks/os_defines.h: Same.
	* config/cpu/sh/atomicity.h: Same.
	* config/io/c_io_stdio.h: Same.
	* config/io/basic_file_stdio.h: Same.

From-SVN: r121502
This commit is contained in:
Benjamin Kosnik 2007-02-02 14:49:52 +00:00 committed by Benjamin Kosnik
parent d4feb3d31a
commit 311635d103
13 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,18 @@
2007-02-02 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/c++config: Consistent macro guards for config includes.
* config/locale/gnu/c_locale.h: Same.
* config/locale/generic/c_locale.h: Same.
* config/allocator/mt_allocator_base.h: Same.
* config/allocator/malloc_allocator_base.h: Same.
* config/allocator/new_allocator_base.h: Same.
* config/allocator/pool_allocator_base.h: Same.
* config/allocator/bitmap_allocator_base.h: Same.
* config/os/vxworks/os_defines.h: Same.
* config/cpu/sh/atomicity.h: Same.
* config/io/c_io_stdio.h: Same.
* config/io/basic_file_stdio.h: Same.
2007-02-01 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/14493

4
libstdc++-v3/config/allocator/bitmap_allocator_base.h
View File

@ -32,8 +32,8 @@
* You should not attempt to use it directly.
*/
#ifndef _CXX_ALLOCATOR_H
#define _CXX_ALLOCATOR_H 1
#ifndef _GLIBCXX_CXX_ALLOCATOR_H
#define _GLIBCXX_CXX_ALLOCATOR_H 1
// Define bitmap_allocator as the base class to std::allocator.
#include <ext/bitmap_allocator.h>

4
libstdc++-v3/config/allocator/malloc_allocator_base.h
View File

@ -32,8 +32,8 @@
* You should not attempt to use it directly.
*/
#ifndef _CXX_ALLOCATOR_H
#define _CXX_ALLOCATOR_H 1
#ifndef _GLIBCXX_CXX_ALLOCATOR_H
#define _GLIBCXX_CXX_ALLOCATOR_H 1
// Define new_allocator as the base class to std::allocator.
#include <ext/malloc_allocator.h>

4
libstdc++-v3/config/allocator/mt_allocator_base.h
View File

@ -32,8 +32,8 @@
* You should not attempt to use it directly.
*/
#ifndef _CXX_ALLOCATOR_H
#define _CXX_ALLOCATOR_H 1
#ifndef _GLIBCXX_CXX_ALLOCATOR_H
#define _GLIBCXX_CXX_ALLOCATOR_H 1
// Define mt_allocator as the base class to std::allocator.
#include <ext/mt_allocator.h>

4
libstdc++-v3/config/allocator/new_allocator_base.h
View File

@ -32,8 +32,8 @@
* You should not attempt to use it directly.
*/
#ifndef _CXX_ALLOCATOR_H
#define _CXX_ALLOCATOR_H 1
#ifndef _GLIBCXX_CXX_ALLOCATOR_H
#define _GLIBCXX_CXX_ALLOCATOR_H 1
// Define new_allocator as the base class to std::allocator.
#include <ext/new_allocator.h>

4
libstdc++-v3/config/allocator/pool_allocator_base.h
View File

@ -32,8 +32,8 @@
* You should not attempt to use it directly.
*/
#ifndef _CXX_ALLOCATOR_H
#define _CXX_ALLOCATOR_H 1
#ifndef _GLIBCXX_CXX_ALLOCATOR_H
#define _GLIBCXX_CXX_ALLOCATOR_H 1
// Define new_allocator as the base class to std::allocator.
#include <ext/pool_allocator.h>

10
libstdc++-v3/config/cpu/sh/atomicity.h
View File

@ -28,11 +28,11 @@
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
#ifndef _BITS_ATOMICITY_H
#define _BITS_ATOMICITY_H 1
#ifdef __SH4A__
#ifndef _GLIBCXX_ATOMICITY_H
#define _GLIBCXX_ATOMICITY_H 1
typedef int _Atomic_word;
static inline _Atomic_word
@ -70,6 +70,8 @@ __atomic_add (volatile _Atomic_word* __mem, int __val)
: "r0");
}
#endif
#else /* !__SH4A__ */
/* This is generic/atomicity.h */
@ -103,5 +105,3 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
_GLIBCXX_END_NAMESPACE
#endif /* !__SH4A__ */
#endif /* atomicity.h */

4
libstdc++-v3/config/io/basic_file_stdio.h
View File

@ -37,8 +37,8 @@
* You should not attempt to use it directly.
*/
#ifndef _BASIC_FILE_STDIO_H
#define _BASIC_FILE_STDIO_H 1
#ifndef _GLIBCXX_BASIC_FILE_STDIO_H
#define _GLIBCXX_BASIC_FILE_STDIO_H 1
#pragma GCC system_header

4
libstdc++-v3/config/io/c_io_stdio.h
View File

@ -35,8 +35,8 @@
// c_io_stdio.h - Defines for using "C" stdio.h
#ifndef _C_IO_STDIO_H
#define _C_IO_STDIO_H 1
#ifndef _GLIBCXX_CXX_IO_H
#define _GLIBCXX_CXX_IO_H 1
#include <cstdio>
#include <cstddef>

4
libstdc++-v3/config/locale/generic/c_locale.h
View File

@ -39,8 +39,8 @@
// Written by Benjamin Kosnik <bkoz@redhat.com>
#ifndef _C_LOCALE_H
#define _C_LOCALE_H 1
#ifndef _GLIBCXX_CXX_LOCALE_H
#define _GLIBCXX_CXX_LOCALE_H 1
#pragma GCC system_header

4
libstdc++-v3/config/locale/gnu/c_locale.h
View File

@ -39,8 +39,8 @@
// Written by Benjamin Kosnik <bkoz@redhat.com>
#ifndef _C_LOCALE_H
#define _C_LOCALE_H 1
#ifndef _GLIBCXX_CXX_LOCALE_H
#define _GLIBCXX_CXX_LOCALE_H 1
#pragma GCC system_header

4
libstdc++-v3/config/os/vxworks/os_defines.h
View File

@ -32,8 +32,8 @@
* You should not attempt to use it directly.
*/
#ifndef _GLIBCPP_OS_DEFINES
#define _GLIBCPP_OS_DEFINES 1
#ifndef _GLIBCXX_OS_DEFINES
#define _GLIBCXX_OS_DEFINES 1
// System-specific #define, typedefs, corrections, etc, go here. This
// file will come before all others.

8
libstdc++-v3/include/bits/c++config
View File

@ -1,7 +1,7 @@
// Predefined symbols and macros -*- C++ -*-
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
// Free Software Foundation, Inc.
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
// 2006, 2007 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
@ -33,8 +33,8 @@
* You should not attempt to use it directly.
*/
#ifndef _CXXCONFIG
#define _CXXCONFIG 1
#ifndef _GLIBCXX_CXX_CONFIG_H
#define _GLIBCXX_CXX_CONFIG_H 1
// Pick up any OS-specific definitions.
#include <bits/os_defines.h>