Browse Source

refactor & fix: 修复CTest运行的一些错误

SongZihuan 3 years ago
parent
commit
c1f323056f
3 changed files with 3 additions and 1 deletions
  1. 1 1
      include/tool/mem.h
  2. 1 0
      test/src/tool-md5.cpp
  3. 1 0
      test/src/tool-regex.cpp

+ 1 - 1
include/tool/mem.h

@@ -9,7 +9,7 @@
 #include "mem.inline.h"
 #include "mem.inline.h"
 
 
 #ifndef MEM_NOT_DEFINE
 #ifndef MEM_NOT_DEFINE
-#define free(p) (safeFree((p)))
+#define free(p) (aFuntool::safeFree((p)))
 #define calloc(n, obj) (obj *)(aFuntool::safeCalloc(n, sizeof(obj)))
 #define calloc(n, obj) (obj *)(aFuntool::safeCalloc(n, sizeof(obj)))
 #define calloc_size(n, size) (aFuntool::safeCalloc(n, size))
 #define calloc_size(n, size) (aFuntool::safeCalloc(n, size))
 #endif
 #endif

+ 1 - 0
test/src/tool-md5.cpp

@@ -1,4 +1,5 @@
 #include "aFuntool.h"
 #include "aFuntool.h"
+using namespace aFuntool;
 
 
 int main(int argc, char **argv) {
 int main(int argc, char **argv) {
     if (argc != 3)
     if (argc != 3)

+ 1 - 0
test/src/tool-regex.cpp

@@ -1,6 +1,7 @@
 #include <cstdio>
 #include <cstdio>
 #include <iostream>
 #include <iostream>
 #include "aFuntool.h"
 #include "aFuntool.h"
+using namespace aFuntool;
 
 
 int main() {
 int main() {
     Regex *rg = new Regex("Hello嘿.*d");
     Regex *rg = new Regex("Hello嘿.*d");