Changeset 828 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/StrOperation.cpp

Timestamp:

Mar 19, 2012, 1:59:48 AM (13 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/BasicCompiler_Common/StrOperation.cpp (modified) (3 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/StrOperation.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-void KillSpaces(char *str1,char *str2){
+#include <abdev/ab_common/include/ab_common.h>
+#include "StrOperation.h"
+#include "common.h"
+
+void KillSpaces(char const *str1,char *str2){
     int i,i2,i3,IsStr;
     for(i=0,i2=0,IsStr=0;;i++,i2++){
@@ -30 +33 @@
     }
 }
-void KillStringSpaces(char *str){
-    char *s2;
-
-    extern HANDLE hHeap;
-    s2=(char *)HeapAlloc(hHeap,0,lstrlen(str)+1);
-    lstrcpy(s2,str);
-    KillSpaces(s2,str);
-    HeapDefaultFree(s2);
-    return;
+void KillStringSpaces(char *str)
+{
+    std::string s2(str);
+    KillSpaces(s2.c_str(), str);
 }
 BOOL RemoveStringQuotes(char *str){
@@ -362 +360 @@
     }
 }
-const std::string &FormatEscapeSequenceStringToDefaultString( const std::string &source )
+std::string FormatEscapeSequenceStringToDefaultString( const std::string &source )
 {
     int maxLength = (int)source.size();