Skip to content

Commit 8da59b2

Browse files
committed
change license to The MIT License
1 parent 8947ef1 commit 8da59b2

File tree

3 files changed

+27
-30
lines changed

3 files changed

+27
-30
lines changed

LICENSE

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Copyright (c) 2011 Fuji Goro (gfx) <gfuji@cpan.org>.
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
4+
5+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
6+
7+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
TimSort
22
==================
33

4-
A C++ implementation of TimSort, O(n log n) in worst case and stable sort algorithm, ported from OpenJDK's.
4+
A C++ implementation of TimSort, O(n log n) in worst case and stable sort algorithm, ported from Python's and OpenJDK's.
55

66
This is a bit slower than `std::sort()` on randomized sequences, and much
77
faster on partially-sorted sequences.

timsort.hpp

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,29 @@
11
/*
22
* C++ implementation of timsort
33
*
4-
* ported from http://cr.openjdk.java.net/~martin/webrevs/openjdk7/timsort/raw_files/new/src/share/classes/java/util/TimSort.java
4+
* ported from Python's and OpenJDK's:
5+
* - http://svn.python.org/projects/python/trunk/Objects/listobject.c
6+
* - http://cr.openjdk.java.net/~martin/webrevs/openjdk7/timsort/raw_files/new/src/share/classes/java/util/TimSort.java
57
*
6-
* Copyright 2011 Fuji, Goro <gfuji@cpan.org>. All rights reserved.
8+
* Copyright (c) 2011 Fuji, Goro (gfx) <gfuji@cpan.org>.
79
*
8-
* You can use and/or redistribute in the same term of the original license.
9-
*/
10-
11-
12-
/* Here is the original license in TimSort.java:
13-
*
14-
*
15-
* Copyright 2009 Google Inc. All Rights Reserved.
16-
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
17-
*
18-
* This code is free software; you can redistribute it and/or modify it
19-
* under the terms of the GNU General Public License version 2 only, as
20-
* published by the Free Software Foundation. Sun designates this
21-
* particular file as subject to the "Classpath" exception as provided
22-
* by Sun in the LICENSE file that accompanied this code.
23-
*
24-
* This code is distributed in the hope that it will be useful, but WITHOUT
25-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
26-
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
27-
* version 2 for more details (a copy is included in the LICENSE file that
28-
* accompanied this code).
10+
* Permission is hereby granted, free of charge, to any person obtaining a copy
11+
* of this software and associated documentation files (the "Software"), to
12+
* deal in the Software without restriction, including without limitation the
13+
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
14+
* sell copies of the Software, and to permit persons to whom the Software is
15+
* furnished to do so, subject to the following conditions:
2916
*
30-
* You should have received a copy of the GNU General Public License version
31-
* 2 along with this work; if not, write to the Free Software Foundation,
32-
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
17+
* The above copyright notice and this permission notice shall be included in
18+
* all copies or substantial portions of the Software.
3319
*
34-
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
35-
* CA 95054 USA or visit www.sun.com if you need additional information or
36-
* have any questions.
20+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
23+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
24+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
25+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
26+
* IN THE SOFTWARE.
3727
*/
3828

3929
#ifndef GFX_TIMSORT_HPP

0 commit comments

Comments
 (0)