Changeset 828 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/common.h

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/BasicCompiler_Common/common.h (modified) (8 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/common.h

@@ -1 +1 @@
 #pragma once
 
-//#define _CRT_SECURE_NO_DEPRECATE
-#pragma warning(disable : 4996)
+
+#include <psapi.h>
 
 #include <option.h>
@@ -17 +17 @@
 
 #include "../BasicCompiler_Common/NonVolatile.h"
-#include <psapi.h>
 
 
@@ -36 +35 @@
 #define MAX_PARMS       64
 #define MAX_ARRAYDIM    16
-#define MAX_HASH        32761
 
 
@@ -42 +40 @@
     #define PLATFORM    64
 #else
-#define PLATFORM    32
-    #ifndef LONG_PTR
-        typedef long LONG_PTR;
-        typedef DWORD ULONG_PTR;
-    #endif
+    #define PLATFORM    32
 #endif
 
@@ -217 +211 @@
 void GetFullPath( char *path, const std::string &baseDirPath );
 void ShowErrorLine(int LineNum,const char *FileName);
-BOOL GetFilePathDialog(HWND hwnd,char *filename,LPSTR Filter,LPSTR Title,BOOL bOpen);
+BOOL GetFilePathDialog(HWND hwnd,char *filename,LPCSTR Filter,LPCSTR Title,BOOL bOpen);
 void MakeMessageText(char *buffer,char *msg,int flag);
 
 //hash.cpp
-int hash_default(const char *name);
 DllProc *GetDeclareHash(const char *name);
 void GetOverloadSubHash( const char *lpszName, std::vector<const UserProc *> &subs );
@@ -303 +296 @@
 
 // StrOperation.cpp
-void KillSpaces(char *str1,char *str2);
+void KillSpaces(const char *str1,char *str2);
 void KillStringSpaces(char *str);
 BOOL RemoveStringQuotes(char *str);
@@ -316 +309 @@
 char GetEndXXXCommand(char es);
 void GetDefaultNameFromES(char es,char *name);
-const std::string &FormatEscapeSequenceStringToDefaultString( const std::string &source );
+std::string FormatEscapeSequenceStringToDefaultString( const std::string &source );
 bool IsFileExist(const char *path);
 BOOL ShortPathToLongPath(char ShortPath[MAX_PATH],char *LongPath);
@@ -370 +363 @@
 void SplitGenericClassInstance( const char *fullName, char *className, Jenga::Common::Strings &typeParameters, bool isDefiningClass = false, Jenga::Common::Strings *pTypeParameterBaseClassNames = NULL );
 int JumpStatement(const char *source, int &pos);
+
+//MakePeHdr.cpp
 void MakeExe();