Tera TermRevision: 7862
https://osdn.net/projects/ttssh2/scm/svn/commits/7862
Author: yutakapon
Date: 2019-07-20 18:51:11 +0900 (Sat, 20 Jul 2019)
Log Message:
-----------
trunkからリビジョン7845をマージ:
TTProxy,Hashtable内で正しくハッシュ値を計算できていなかったため修正
- r7536でエンバグ
- gcc で FARPROC が void * とマッチしないので HASHCODE.h にコンストラクタを追加
- ticket #39376
........
OpenSSL 1.1.1対応でTTProxyを改修しているため、テストに必要となる。
チケット #36876
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/39376
https://osdn.net/projects/ttssh2/tracker/detail/36876
Modified Paths:
--------------
branches/openssl_1_1_1_v2/TTProxy/YCL/include/YCL/HASHCODE.h
branches/openssl_1_1_1_v2/TTProxy/YCL/include/YCL/Hashtable.h
Property Changed:
----------------
branches/openssl_1_1_1_v2/TTProxy/
-------------- next part --------------
Index: branches/openssl_1_1_1_v2/TTProxy
===================================================================
--- branches/openssl_1_1_1_v2/TTProxy 2019-07-19 14:42:51 UTC (rev 7861)
+++ branches/openssl_1_1_1_v2/TTProxy 2019-07-20 09:51:11 UTC (rev 7862)
Property changes on: branches/openssl_1_1_1_v2/TTProxy
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
-/branches/vs2015_warn/TTProxy:6194-6285
\ No newline at end of property
+/branches/vs2015_warn/TTProxy:6194-6285
+/trunk/TTProxy:7845
\ No newline at end of property
Modified: branches/openssl_1_1_1_v2/TTProxy/YCL/include/YCL/HASHCODE.h
===================================================================
--- branches/openssl_1_1_1_v2/TTProxy/YCL/include/YCL/HASHCODE.h 2019-07-19 14:42:51 UTC (rev 7861)
+++ branches/openssl_1_1_1_v2/TTProxy/YCL/include/YCL/HASHCODE.h 2019-07-20 09:51:11 UTC (rev 7862)
@@ -27,6 +27,8 @@
}
HASHCODE(const void* value):value((int)(uintptr_t) value) {
}
+ HASHCODE(const FARPROC value):value((int)(uintptr_t) value) {
+ }
HASHCODE(int value):value(value) {
}
operator int()const {
Modified: branches/openssl_1_1_1_v2/TTProxy/YCL/include/YCL/Hashtable.h
===================================================================
--- branches/openssl_1_1_1_v2/TTProxy/YCL/include/YCL/Hashtable.h 2019-07-19 14:42:51 UTC (rev 7861)
+++ branches/openssl_1_1_1_v2/TTProxy/YCL/include/YCL/Hashtable.h 2019-07-20 09:51:11 UTC (rev 7862)
@@ -122,7 +122,7 @@
// \x91S\x82ẴG\x83\x93\x83g\x83\x8A\x82\xAA\x90ݒ\xE8\x8Dς݂\xC5key\x82Ɠ\x99\x82\xB5\x82\xA2\x82\xE0\x82̂\xAA\x82Ȃ\xAF\x82\xEA\x82\xCE-1\x82\xF0\x95Ԃ\xB7\x81B
int find(const TYPE_KEY& key)const {
int found = -1;
- int h = HASHCODE(&key);
+ int h = HASHCODE(key);
for (int i = 0; i < backetSize; i++) {
int index = ((unsigned) h + i) % backetSize;
const TYPE_KEY& bkey = backet[index].key;