diff options
Diffstat (limited to 'plugins/NewAwaySysMod/CommonLibs')
| -rw-r--r-- | plugins/NewAwaySysMod/CommonLibs/CString.cpp | 8 | ||||
| -rw-r--r-- | plugins/NewAwaySysMod/CommonLibs/CString.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/NewAwaySysMod/CommonLibs/CString.cpp b/plugins/NewAwaySysMod/CommonLibs/CString.cpp index de3b1a3297..a021132b14 100644 --- a/plugins/NewAwaySysMod/CommonLibs/CString.cpp +++ b/plugins/NewAwaySysMod/CommonLibs/CString.cpp @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-//#include <stdio.h>
+#define _CRT_SECURE_NO_WARNINGS
#include "CString.h"
#define STR_GROWBY 64
@@ -158,7 +158,7 @@ TString<T>& TString<T>::Replace(const T *szFind, const T *szReplaceBy) TString<T> Result;
Result.GetBuffer(1)[0] = '\0';
Result.ReleaseBuffer(0); // set the string to ""; we can't do it in a usual way (using a constructor or an assignment) because we don't know whether "" needs to be unicode or ansi
- while (p = My_strstr(pCurPos, szFind))
+ while (p = ( T* )My_strstr(pCurPos, szFind))
{
Result.DiffCat(pCurPos, p);
Result += szReplaceBy;
@@ -339,8 +339,8 @@ TCString DBGetContactSettingString(HANDLE hContact, const char *szModule, const int DBGetContactSettingString(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv)
{
- //return DBGetContactSettingString_Helper(hContact, szModule, szSetting, dbv, __FILE__, __LINE__, DBVT_ASCIIZ);
- return DBGetContactSettingString_Helper(hContact, szModule, szSetting, dbv, DBVT_ASCIIZ);
+ return DBGetContactSettingString_Helper(hContact, szModule, szSetting, dbv, __FILE__, __LINE__, DBVT_ASCIIZ);
+ //return DBGetContactSettingString_Helper(hContact, szModule, szSetting, dbv, DBVT_ASCIIZ);
}
diff --git a/plugins/NewAwaySysMod/CommonLibs/CString.h b/plugins/NewAwaySysMod/CommonLibs/CString.h index 8ba1a8da07..ed2540c511 100644 --- a/plugins/NewAwaySysMod/CommonLibs/CString.h +++ b/plugins/NewAwaySysMod/CommonLibs/CString.h @@ -33,7 +33,7 @@ __inline int My_lstrlen(LPCSTR lpString) {return lstrlenA(lpString);} __inline int My_lstrlen(LPCWSTR lpString) {return lstrlenW(lpString);}
__inline int My_lstrcmp(LPCSTR lpString1, LPCSTR lpString2) {return lstrcmpA(lpString1, lpString2);}
__inline int My_lstrcmp(LPCWSTR lpString1, LPCWSTR lpString2) {return lstrcmpW(lpString1, lpString2);}
-__inline LPSTR My_strstr(LPCSTR lpString1, LPCSTR lpString2) {return strstr(lpString1, lpString2);}
+__inline LPCSTR My_strstr(LPCSTR lpString1, LPCSTR lpString2) {return strstr(lpString1, lpString2);}
__inline LPWSTR My_strstr(LPCWSTR lpString1, LPCWSTR lpString2) {return (LPWSTR)wcsstr(lpString1, lpString2);}
__inline LPSTR My_lstrcpy(LPSTR lpString1, LPCSTR lpString2) {return lstrcpyA(lpString1, lpString2);}
__inline LPWSTR My_lstrcpy(LPWSTR lpString1, LPCWSTR lpString2) {return lstrcpyW(lpString1, lpString2);}
|