Changeset 828 in dev for trunk/ab5.0/abdev/ab_common/src/Lexical/Type.cpp

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/ab_common/src/Lexical/Type.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/ab_common/src/Lexical/Type.cpp

@@ -1 +1 @@
 #include "stdafx.h"
+#include <jenga/include/jenga.h>
+#include <abdev/ab_common/include/ab_common.h>
+#include "Lexical/Type.h"
 
 const int Type::basicTypeList[] = {
@@ -539 +542 @@
 
 int Type::GetBasicTypeFromSimpleName( const char *variable ){
-    extern char DefIntVari[26],DefSngVari[26],DefStrVari[26],divNum,dsvNum,dStrvNum;
+    assert(variable != nullptr);
+    auto length = std::strlen(variable);
+    assert(length > 0);
+
     int i;
     char name[VN_SIZE];
 
     //構造体メンバの場合を考慮
-    for(i=lstrlen(variable);i>0;i--){
+    for(i=length;i>0;i--){
         if(variable[i]=='.'){
             i++;