summaryrefslogtreecommitdiff
path: root/stlport
diff options
context:
space:
mode:
authorAndrew Rist <arist@apache.org>2012-01-12 18:46:42 +0000
committerAndrew Rist <arist@apache.org>2012-01-12 18:46:42 +0000
commit9633e67acb6606a7934225447a526ec13bde26d1 (patch)
tree1bd20b4d8a0b09ea64832e52dcbe2c3c3462ae41 /stlport
parent07bd7e9434ddb7daf7c9b3af25ec76af27257211 (diff)
Update headers to Alv2 headers
Diffstat (limited to 'stlport')
-rw-r--r--stlport/systemstlguards/postextstl.h48
-rw-r--r--stlport/systemstlguards/preextstl.h40
2 files changed, 40 insertions, 48 deletions
diff --git a/stlport/systemstlguards/postextstl.h b/stlport/systemstlguards/postextstl.h
index 81a21e25c15b..e123c7b83d3a 100644
--- a/stlport/systemstlguards/postextstl.h
+++ b/stlport/systemstlguards/postextstl.h
@@ -1,29 +1,25 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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.
+ *
+ *************************************************************/
+
+
#ifdef std_was_redefined_as_stlport
// put things back the way they were
diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
index 763f0dfa79f3..9cdcb4de9993 100644
--- a/stlport/systemstlguards/preextstl.h
+++ b/stlport/systemstlguards/preextstl.h
@@ -1,29 +1,25 @@
-/*************************************************************************
+/**************************************************************
*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * 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 file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *************************************************************/
+
+
//1. Force inclusion of a std:: using header to ensure the stlport define
//of std as "stlport"
#include <algorithm>