Skip to content

Commit 07e989a

Browse files
yuanguyuangu
committed
修复编译失败问题
1 parent 0f977b9 commit 07e989a

3 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎python/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383

8484
setuptools.setup(
8585
name="sxtwl",
86-
version="2.0.5",
86+
version="2.0.6",
8787
author="yuangu",
8888
author_email="seantone@126.com",
8989
description="sxtwl_cpp warpper for python",

‎src/day.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ class Day
129129
public:
130130
static Day *fromSolar(int _year, uint8_t _month, int _day)
131131
{
132-
Time t = { 0 };
132+
Time t;
133133
t.h = 12, t.m = 0, t.s = 0.1;
134134
t.Y = _year;
135135
t.M = _month;
@@ -140,7 +140,7 @@ class Day
140140

141141
static Day *fromLunar(int year, uint8_t month, int day, bool isRun = false)
142142
{
143-
Time t = { 0 };
143+
Time t;
144144
t.h = 12, t.m = 0, t.s = 0.1;
145145
t.Y = year;
146146
t.M = 1;

‎src/sxtwl.cpp‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -229,41 +229,41 @@ namespace sxtwl
229229
//定节气范围
230230
if (i == 1 && jiqiIndex == 23)
231231
{
232-
if (!SSQPtr->ZQ.size() || Bd0 + 360 < SSQPtr->ZQ[0] || Bd0 + 360 >= SSQPtr->ZQ[24])
232+
if (!SSQPtr.ZQ.size() || Bd0 + 360 < SSQPtr.ZQ[0] || Bd0 + 360 >= SSQPtr.ZQ[24])
233233
{
234-
SSQPtr->calcY(Bd0 + 360);
234+
SSQPtr.calcY(Bd0 + 360);
235235
}
236236
index = 1;
237237
}
238238
else
239239
{
240-
if (!SSQPtr->ZQ.size() || Bd0 < SSQPtr->ZQ[0] || Bd0 >= SSQPtr->ZQ[24])
240+
if (!SSQPtr.ZQ.size() || Bd0 < SSQPtr.ZQ[0] || Bd0 >= SSQPtr.ZQ[24])
241241
{
242-
SSQPtr->calcY(Bd0);
242+
SSQPtr.calcY(Bd0);
243243
}
244244
}
245245

246-
int mk = int2((SSQPtr->ZQ[index] - SSQPtr->ZQ[0]) / 30.43685);
246+
int mk = int2((SSQPtr.ZQ[index] - SSQPtr.ZQ[0]) / 30.43685);
247247
//相对大雪的月数计算,mk的取值范围0-12
248-
if (mk < 12 && SSQPtr->ZQ[index] >= SSQPtr->ZQ[2 * mk + 1])
248+
if (mk < 12 && SSQPtr.ZQ[index] >= SSQPtr.ZQ[2 * mk + 1])
249249
{
250250
mk++;
251251
}
252252

253-
int D = mk + int2((SSQPtr->ZQ[12] + 390) / 365.2422) * 12 + 900000; //相对于1998年12月7(大雪)的月数,900000为正数基数
253+
int D = mk + int2((SSQPtr.ZQ[12] + 390) / 365.2422) * 12 + 900000; //相对于1998年12月7(大雪)的月数,900000为正数基数
254254

255255
////纪日,2000年1月7日起算
256-
D = SSQPtr->ZQ[index] - 6 + 9000000;
256+
D = SSQPtr.ZQ[index] - 6 + 9000000;
257257

258258
if (i == 0)
259259
{
260-
startJD = SSQPtr->ZQ[index];
260+
startJD = SSQPtr.ZQ[index];
261261
startT = JD::JD2DD(startJD + J2000);
262262
startGz.tg = D % 10;
263263
startGz.dz = D % 12;
264264

265265
//获取准确节气的时间
266-
auto jd2 = SSQPtr->ZQ[0] + dt_T(SSQPtr->ZQ[0]) - (8.0 / 24.0);
266+
auto jd2 = SSQPtr.ZQ[0] + dt_T(SSQPtr.ZQ[0]) - (8.0 / 24.0);
267267
auto w = XL::S_aLon(jd2 / 36525, 3);
268268
w = int2((w - 0.13) / pi2 * 24) * pi2 / 24;
269269

@@ -276,7 +276,7 @@ namespace sxtwl
276276
D = int2(d + 0.5);
277277
auto xn = int2(w / pi2 * 24 + 24000006.01) % 24;
278278
w += pi2 / 24;
279-
if (D < SSQPtr->ZQ[i])
279+
if (D < SSQPtr.ZQ[i])
280280
continue;
281281
break;
282282
}
@@ -292,13 +292,13 @@ namespace sxtwl
292292
}
293293
else
294294
{
295-
endJD = SSQPtr->ZQ[index];
295+
endJD = SSQPtr.ZQ[index];
296296
endT = JD::JD2DD(endJD + J2000);
297297
endGz.tg = D % 10;
298298
endGz.dz = D % 12;
299299

300300
//获取准确节气的时间
301-
auto jd2 = SSQPtr->ZQ[0] + dt_T(SSQPtr->ZQ[0]) - (8.0 / 24.0);
301+
auto jd2 = SSQPtr.ZQ[0] + dt_T(SSQPtr.ZQ[0]) - (8.0 / 24.0);
302302
auto w = XL::S_aLon(jd2 / 36525, 3);
303303
w = int2((w - 0.13) / pi2 * 24) * pi2 / 24;
304304

@@ -311,7 +311,7 @@ namespace sxtwl
311311
D = int2(d + 0.5);
312312
auto xn = int2(w / pi2 * 24 + 24000006.01) % 24;
313313
w += pi2 / 24;
314-
if (D < SSQPtr->ZQ[i])
314+
if (D < SSQPtr.ZQ[i])
315315
continue;
316316
break;
317317
}
@@ -482,17 +482,17 @@ namespace sxtwl
482482
//公历月首的儒略日,中午;
483483
int Bd0 = int2(JD::toJD(t)) - J2000;
484484

485-
if (!SSQPtr->ZQ.size() || Bd0 < SSQPtr->ZQ[0] || Bd0 >= SSQPtr->ZQ[24])
485+
if (!SSQPtr.ZQ.size() || Bd0 < SSQPtr.ZQ[0] || Bd0 >= SSQPtr.ZQ[24])
486486
{
487-
SSQPtr->calcY(Bd0);
487+
SSQPtr.calcY(Bd0);
488488
}
489489

490490
//{ "十一", "十二", "正", "二", "三", "四", "五", "六", "七", "八", "九", "十" }
491491
// static int mkIndex[] = { 11, 12, 1,2,3,4,5,6,7, 8,9,10 };
492492
static int yueIndex[] = {11, 12, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
493493

494494
//需要排除11月和12月的，这个可能属于上一个月的信息
495-
int leap = SSQPtr->leap - 1;
495+
int leap = SSQPtr.leap - 1;
496496
if (leap > 1)
497497
{
498498
return yueIndex[leap];
@@ -501,11 +501,11 @@ namespace sxtwl
501501
//看看11月和12月是否有闰
502502
t.Y = By + 1;
503503
Bd0 = int2(JD::toJD(t)) - J2000;
504-
if (!SSQPtr->ZQ.size() || Bd0 < SSQPtr->ZQ[0] || Bd0 >= SSQPtr->ZQ[24])
504+
if (!SSQPtr.ZQ.size() || Bd0 < SSQPtr.ZQ[0] || Bd0 >= SSQPtr.ZQ[24])
505505
{
506-
SSQPtr->calcY(Bd0);
506+
SSQPtr.calcY(Bd0);
507507
}
508-
leap = SSQPtr->leap - 1;
508+
leap = SSQPtr.leap - 1;
509509
if (leap > 1 || leap < 0)
510510
{
511511
return 0;
@@ -530,9 +530,9 @@ namespace sxtwl
530530
//公历月首的儒略日,中午;
531531
int Bd0 = int2(JD::toJD(t)) - J2000;
532532

533-
if (!SSQPtr->ZQ.size() || Bd0 < SSQPtr->ZQ[0] || Bd0 >= SSQPtr->ZQ[24])
533+
if (!SSQPtr.ZQ.size() || Bd0 < SSQPtr.ZQ[0] || Bd0 >= SSQPtr.ZQ[24])
534534
{
535-
SSQPtr->calcY(Bd0);
535+
SSQPtr.calcY(Bd0);
536536
}
537537

538538
//{ "十一", "十二", "正", "二", "三", "四", "五", "六", "七", "八", "九", "十" }
@@ -551,14 +551,14 @@ namespace sxtwl
551551
}
552552

553553
int mk = 0;
554-
int leap = SSQPtr->leap - 1;
554+
int leap = SSQPtr.leap - 1;
555555

556556
if (isRun && ((leap < 0) || (leap >= 0 && month != yueIndex[leap])))
557557
{
558558
//throw CalendarException(ErrorCode_NotRun);
559559
}
560560

561-
for (auto it = SSQPtr->ym.begin(); it != SSQPtr->ym.end(); ++it)
561+
for (auto it = SSQPtr.ym.begin(); it != SSQPtr.ym.end(); ++it)
562562
{
563563

564564
if (leap < 0)
@@ -595,9 +595,9 @@ namespace sxtwl
595595
}
596596

597597
//阴历首月的儒略日
598-
int bdi = SSQPtr->HS[mk];
598+
int bdi = SSQPtr.HS[mk];
599599

600-
return SSQPtr->HS[mk + 1] - SSQPtr->HS[mk];
600+
return SSQPtr.HS[mk + 1] - SSQPtr.HS[mk];
601601
}
602602

603603
//儒略日数转公历

0 commit comments

Comments
 (0)