From 7f45e69221d65ec15b0684680c85fb7ed28169f3 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 08 七月 2024 17:09:04 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/src/xstring.cpp | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/jrj/xframe/src/xstring.cpp b/jrj/xframe/src/xstring.cpp
index 3bc27b1..ff59009 100644
--- a/jrj/xframe/src/xstring.cpp
+++ b/jrj/xframe/src/xstring.cpp
@@ -255,6 +255,7 @@
if(rhs.data)((KStringBlock<wchar_t>*)rhs.data)->AddRef();
}
+
xstring::xstring(wchar_t* val, bool shouldSysFree) :data(KStringBlock<wchar_t>::make(val,shouldSysFree))
{
@@ -268,14 +269,19 @@
{
}
+xstring::xstring(LPARAM val, bool bdata) :data(bdata?(void*)val:(KStringBlock<wchar_t>::make(val)))
+{
+ if (bdata)
+ {
+ ((KStringBlock<wchar_t>*)data)->AddRef();
+ }
+}
+
xstring::xstring(double val):data((KStringBlock<wchar_t>::make(val)))
{
}
-xstring::xstring(LPARAM val):data((KStringBlock<wchar_t>::make(val)))
-{
-}
xstring::~xstring()
{
--
Gitblit v1.9.3