diff options
| author | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-04-03 10:54:41 +0000 |
|---|---|---|
| committer | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-04-03 10:54:41 +0000 |
| commit | 58065e8fd229db89773d4be358c1f6186f0e47c2 (patch) | |
| tree | b9f61d7391f13503bbc1506d0cbd1e88685dbb81 /libstdc++-v3/include/tr1/random | |
| parent | 8c92199d1cd0548d2315ae70e3e555eebfc51e3b (diff) | |
2009-04-03 Richard Guenther <rguenther@suse.de>alias-improvements
Merge from trunk r145494.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/alias-improvements@145496 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/tr1/random')
| -rw-r--r-- | libstdc++-v3/include/tr1/random | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/libstdc++-v3/include/tr1/random b/libstdc++-v3/include/tr1/random index 6f6e3234b89..f420b2feeba 100644 --- a/libstdc++-v3/include/tr1/random +++ b/libstdc++-v3/include/tr1/random @@ -1,6 +1,6 @@ // random number generation -*- C++ -*- -// Copyright (C) 2006, 2007 Free Software Foundation, Inc. +// Copyright (C) 2006, 2007, 2008, 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 @@ -37,10 +37,6 @@ #pragma GCC system_header -#if defined(_GLIBCXX_INCLUDE_AS_CXX0X) -# error TR1 header cannot be included from C++0x header -#endif - #include <cmath> #include <cstdio> #include <cstdlib> @@ -54,14 +50,10 @@ #include <tr1/type_traits> #include <tr1/cmath> -#if defined(_GLIBCXX_INCLUDE_AS_TR1) -# include <tr1/random.h> -#else -# define _GLIBCXX_INCLUDE_AS_TR1 -# define _GLIBCXX_TR1 tr1:: -# include <tr1/random.h> -# undef _GLIBCXX_TR1 -# undef _GLIBCXX_INCLUDE_AS_TR1 +#include <tr1/random.h> + +#ifndef _GLIBCXX_EXPORT_TEMPLATE +# include <tr1/random.tcc> #endif #endif // _GLIBCXX_TR1_RANDOM |