From patchwork Thu Sep  9 11:24:43 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Paolo Carlini <paolo.carlini@oracle.com>
X-Patchwork-Id: 64287
Return-Path: 
 <gcc-patches-return-272476-incoming=patchwork.ozlabs.org@gcc.gnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	by ozlabs.org (Postfix) with SMTP id 0927DB70A6
	for <incoming@patchwork.ozlabs.org>;
	Thu,  9 Sep 2010 21:24:57 +1000 (EST)
Received: (qmail 24434 invoked by alias); 9 Sep 2010 11:24:53 -0000
Received: (qmail 24415 invoked by uid 22791); 9 Sep 2010 11:24:52 -0000
X-SWARE-Spam-Status: No, hits=-1.9 required=5.0	tests=AWL, BAYES_00,
	RCVD_IN_DNSWL_NONE
X-Spam-Check-By: sourceware.org
Received: from vsmtp3.tin.it (HELO vsmtp3.tin.it) (212.216.176.223) by
	sourceware.org (qpsmtpd/0.43rc1) with ESMTP;
	Thu, 09 Sep 2010 11:24:46 +0000
Received: from [192.168.0.4] (79.53.13.46) by vsmtp3.tin.it (8.5.113) id
	4BCE36060AAE0569; Thu, 9 Sep 2010 13:24:43 +0200
Message-ID: <4C88C3FB.6050409@oracle.com>
Date: Thu, 09 Sep 2010 13:24:43 +0200
From: Paolo Carlini <paolo.carlini@oracle.com>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.9.1.11) Gecko/20100714 SUSE/3.0.6 Thunderbird/3.0.6
MIME-Version: 1.0
To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>
CC: libstdc++ <libstdc++@gcc.gnu.org>
Subject: [v3] libstdc++/45613
X-IsSubscribed: yes
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

Hi,

tested x86_64-linux, committed.

Paolo.

/////////////
2010-09-09  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/45613
	* include/bits/random.tcc: Add missing include guards.
	* include/bits/random.h: Likewise.
	* include/tr1/random.tcc: Likewise.

Index: include/bits/random.tcc
===================================================================
--- include/bits/random.tcc	(revision 164072)
+++ include/bits/random.tcc	(working copy)
@@ -27,6 +27,9 @@
  *  You should not attempt to use it directly.
  */
 
+#ifndef _RANDOM_TCC
+#define _RANDOM_TCC 1
+
 #include <numeric> // std::accumulate and std::partial_sum
 
 namespace std
@@ -2815,3 +2818,5 @@
       return __sum / __tmp;
     }
 }
+
+#endif
Index: include/bits/random.h
===================================================================
--- include/bits/random.h	(revision 164072)
+++ include/bits/random.h	(working copy)
@@ -28,6 +28,9 @@
  *  You should not attempt to use it directly.
  */
 
+#ifndef _RANDOM_H
+#define _RANDOM_H 1
+
 #include <vector>
 
 namespace std
@@ -5337,6 +5340,6 @@
   /* @} */ // group random_utilities
 
   /* @} */ // group random
-
 }
 
+#endif
Index: include/tr1/random.tcc
===================================================================
--- include/tr1/random.tcc	(revision 164072)
+++ include/tr1/random.tcc	(working copy)
@@ -28,6 +28,9 @@
  *  You should not attempt to use it directly.
  */
 
+#ifndef _GLIBCXX_TR1_RANDOM_TCC
+#define _GLIBCXX_TR1_RANDOM_TCC 1
+
 namespace std
 {
 namespace tr1
@@ -1708,3 +1711,5 @@
     }
 }
 }
+
+#endif