Merge branch 'master' of https://github.com/fasiondog/hikyuu into dev…

…elop
tianhm · Apr 22, 2022 · e1813ce · e1813ce
2 parents 9de2354 + b8d7a68
commit e1813ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/hikyuu_cpp/hikyuu/trade_manage/TradeManager.cpp b/hikyuu_cpp/hikyuu/trade_manage/TradeManager.cpp
@@ -1191,7 +1191,7 @@ FundsRecord TradeManager::getFunds(const Datetime& indatetime, KQuery::KType kty
     // HKU_IF_RETURN(indatetime == Null<Datetime>() || indatetime == lastDatetime(),
     // getFunds(ktype));
 
-    Datetime datetime(indatetime.year(), indatetime.month(), indatetime.day(), 11, 59);
+    Datetime datetime(indatetime.year(), indatetime.month(), indatetime.day(), 23, 59);
     price_t market_value = 0.0;
     price_t short_market_value = 0.0;
     if (datetime > lastDatetime()) {

diff --git a/hikyuu_cpp/unit_test/xmake.lua b/hikyuu_cpp/unit_test/xmake.lua
@@ -113,6 +113,7 @@ target("small-test")
     if is_plat("linux") or is_plat("macosx") then
         add_links("boost_unit_test_framework")
         add_links("boost_filesystem")
+        add_links("boost_atomic")
         add_shflags("-Wl,-rpath=$ORIGIN", "-Wl,-rpath=$ORIGIN/../lib")
     end
 
@@ -121,4 +122,4 @@ target("small-test")
     add_files("./hikyuu/test_main.cpp")
 
     after_run(coverage_report)
-target_end()
+target_end()