Merge from v2.1

activesys · Apr 21, 2013 · 1ee1a0b · 1ee1a0b
2 parents 280d594 + 87df144
commit 1ee1a0b
Show file tree

Hide file tree

Showing 48 changed files with 2,221 additions and 225 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-22    Bo Wang <activesys.wb@gmail.com>
+    * Release libcstl-2.1.1
+    * Fixup bug 4, 17, 18, 20, 21, 23.
+    * Add priority_queue_init_copy_array and priority_queue_init_copy_array_ex interface.
+
 2012-07-12    Bo Wang <activesys.wb@gmail.com>
     * Release libcstl-2.1.0
 

diff --git a/build-win/libcstl.def b/build-win/libcstl.def
@@ -1,6 +1,6 @@
 ; Define export functions for libcstl
 LIBRARY libcstl
-VERSION 2.0
+VERSION 2.2
 
 EXPORTS
 ; type interfaces
@@ -273,6 +273,8 @@ EXPORTS
     priority_queue_top                      @9010
     _priority_queue_push                    @9011
     priority_queue_pop                      @9012
+    priority_queue_init_copy_array          @9013
+    priority_queue_init_copy_array_ex       @9014
 
 ; string_t interfaces
     create_string                           @10000

diff --git a/build-win/libcstl.rc b/build-win/libcstl.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,0,0
- PRODUCTVERSION 2,1,0,0
+ FILEVERSION 2,2,0,0
+ PRODUCTVERSION 2,2,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -72,12 +72,12 @@ BEGIN
             VALUE "Comments", "����C���Ե�ͨ�����ݽṹ�ͳ����㷨�����"
             VALUE "CompanyName", "WB"
             VALUE "FileDescription", "libcstl Dynamic Link Library"
-            VALUE "FileVersion", "2.1.0"
+            VALUE "FileVersion", "2.2.0"
             VALUE "InternalName", "libcstl"
-            VALUE "LegalCopyright", "Copyright (C) 2008 - 2012 Wangbo"
+            VALUE "LegalCopyright", "Copyright (C) 2008 - 2013 Wangbo"
             VALUE "OriginalFilename", "libcstl.dll"
             VALUE "ProductName", "libcstl Dynamic Link Library"
-            VALUE "ProductVersion", "2.1.0"
+            VALUE "ProductVersion", "2.2.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/build-win/vc8/libcstl.vcproj b/build-win/vc8/libcstl.vcproj
@@ -183,11 +183,43 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\src\cstl_algo.c"
+				RelativePath="..\..\src\cstl_algo_mutating.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\cstl_algobase.c"
+				RelativePath="..\..\src\cstl_algo_mutating_aux.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\cstl_algo_mutating_aux.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\cstl_algo_mutating_private.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\cstl_algo_nonmutating.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\cstl_algo_nonmutating_private.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\cstl_algo_sorting.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\cstl_algo_sorting_aux.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\cstl_algo_sorting_aux.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\cstl_algo_sorting_private.c"
 				>
 			</File>
 			<File
@@ -266,6 +298,10 @@
 				RelativePath="..\..\src\cstl_function.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\cstl_function_private.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\cstl_hash_map.c"
 				>
@@ -370,6 +406,14 @@
 				RelativePath="..\..\src\cstl_heap.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\cstl_heap_aux.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\cstl_heap_aux.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\cstl_iterator.c"
 				>
@@ -466,6 +510,10 @@
 				RelativePath="..\..\src\cstl_numeric.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\cstl_numeric_private.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\cstl_pair.c"
 				>
@@ -681,19 +729,27 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\cstl\cstl_algo.h"
+				RelativePath="..\..\cstl\cstl_algo_mutating.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\cstl\cstl_algo_mutating_private.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\cstl\cstl_algo_nonmutating.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\cstl\cstl_algo_private.h"
+				RelativePath="..\..\cstl\cstl_algo_nonmutating_private.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\cstl\cstl_algobase.h"
+				RelativePath="..\..\cstl\cstl_algo_sorting.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\cstl\cstl_algobase_private.h"
+				RelativePath="..\..\cstl\cstl_algo_sorting_private.h"
 				>
 			</File>
 			<File