# HG changeset patch
# User Stefan Teleman <stefan.teleman@oracle.com>
# Date 1376506890 25200
# Node ID d2ccaa434c25002ad07fb285df34668c95054d04
# Parent  37535b56e7a5d5868ee0d0f7517a0128d173d2ef
17213162 include/loc/_collate.h (collate_byname) should be a virtual destructor
17061683 stdcxx needs extra stuff in the license attribution

diff -r 37535b56e7a5 -r d2ccaa434c25 components/stdcxx/patches/066-6920783-locale.patch
--- a/components/stdcxx/patches/066-6920783-locale.patch	Mon Aug 12 23:00:17 2013 -0700
+++ b/components/stdcxx/patches/066-6920783-locale.patch	Wed Aug 14 12:01:30 2013 -0700
@@ -108,7 +108,7 @@
 +
 +protected:
 +
-+    virtual collate_byname () { }
++    virtual ~collate_byname () { }
  };
  
  
diff -r 37535b56e7a5 -r d2ccaa434c25 components/stdcxx/stdcxx.license
--- a/components/stdcxx/stdcxx.license	Mon Aug 12 23:00:17 2013 -0700
+++ b/components/stdcxx/stdcxx.license	Wed Aug 14 12:01:30 2013 -0700
@@ -204,3 +204,49 @@
    implied.   See  the License  for  the  specific language  governing
    permissions and limitations under the License.
 
+ADDITIONAL README AND COPYRIGHT NOTICES PRESENT IN SOURCE
+CODE FILES:
+
+1. Copyright Header:
+
+/**************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+This copyright header is present in all STDCXX source code files.
+The copyright start and end year vary from file to file.
+
+2. Additional Copyright Information:
+
+Apache C++ Standard Library - stdcxx
+
+Copyright 2005-2007 The Apache Software Foundation.
+
+This product includes software developed at The Apache Software Foundation
+(http://www.apache.org/).
+
+Portions of this software were developed at Rogue Wave Software, Inc.,
+Copyright (c) 1994-2007.
+
+This software contains code derived from the HP Standard Template Library,
+Copyright (c) 1994 Hewlett-Packard Company.
+
+This software contains PA-RISC assembly code,
+Copyright (c) 2002 Hewlett-Packard Company.
+