Changeset 806 in dev for branches/egtra/ab5.0/abdev/BasicCompiler_Common

Timestamp:

Feb 12, 2011, 2:32:22 AM (14 years ago)

Author:

イグトランス (egtra)

Message:

コンパイラのstdafx.h, .cppを32/64ビットで共通化。Windows SDKに含まれるライブラリ・ヘッダの除去。VC++ 2010 Express with WDKのATL環境で_SECURE_ATLがエラーを起こす問題の修正。4996警告の抑制pragmaを削除。ほか。

Location:

branches/egtra/ab5.0/abdev/BasicCompiler_Common

Files:

• BasicCompiler.cpp (modified) (2 diffs)
• Psapi.h (deleted)
• common.h (modified) (4 diffs)
• hash.cpp (modified) (1 diff)
• src/BoostSerializationSupport.cpp (modified) (1 diff)
• stdafx.cpp (moved) (moved from branches/egtra/ab5.0/abdev/compiler_x86/stdafx.cpp )
• stdafx.h (moved) (moved from branches/egtra/ab5.0/abdev/compiler_x86/stdafx.h )

branches/egtra/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp

@@ -731 +731 @@
     if( program.IsClipCompileView() ){
         //ProjectEditor埋め込み型インターフェイス
-        hMainDlg=CreateDialog(hInst,MAKEINTRESOURCE(IDD_CLIPMAIN),hOwnerEditor,(DLGPROC)DlgCompile);
+        hMainDlg=CreateDialog(hInst, MAKEINTRESOURCE(IDD_CLIPMAIN), hOwnerEditor, DlgCompile);
         ShowWindow(hMainDlg,SW_SHOW);
         SendMessage(hOwnerEditor,WM_SETCOMPILEVIEW,0,(LPARAM)hMainDlg);
@@ -773 +773 @@
 
     //エラーリストをサブクラス化
-    OldErrorListProc=(WNDPROC)GetWindowLongPtr(GetDlgItem(hMainDlg,IDC_ERRORLIST),GWLP_WNDPROC);
-    SetWindowLongPtr(GetDlgItem(hMainDlg,IDC_ERRORLIST),GWLP_WNDPROC,(LONG_PTR)ErrorListProc);
+    OldErrorListProc = reinterpret_cast<WNDPROC>(SetWindowLongPtr(GetDlgItem(hMainDlg, IDC_ERRORLIST), GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(ErrorListProc)));
 
     //デバッグリストをサブクラス化
-    OldDebugListProc=(WNDPROC)GetWindowLongPtr(GetDlgItem(hMainDlg,IDC_DEBUGLIST),GWLP_WNDPROC);
-    SetWindowLongPtr(GetDlgItem(hMainDlg,IDC_DEBUGLIST),GWLP_WNDPROC,(LONG_PTR)DebugListProc);
+    OldDebugListProc = reinterpret_cast<WNDPROC>(SetWindowLongPtr(GetDlgItem(hMainDlg, IDC_DEBUGLIST), GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(DebugListProc)));
 
     if( program.IsKickedFromEditor() )

branches/egtra/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 "../BasicCompiler_Common/psapi.h"
 
 
@@ -42 +41 @@
     #define PLATFORM    64
 #else
-#define PLATFORM    32
-    #ifndef LONG_PTR
-        typedef long LONG_PTR;
-        typedef DWORD ULONG_PTR;
-    #endif
+    #define PLATFORM    32
 #endif
 
@@ -221 +216 @@
 
 //hash.cpp
-int hash_default(const char *name);
 DllProc *GetDeclareHash(const char *name);
 void GetOverloadSubHash( const char *lpszName, std::vector<const UserProc *> &subs );

branches/egtra/ab5.0/abdev/BasicCompiler_Common/hash.cpp

@@ -12 +12 @@
 
 using namespace ActiveBasic::Compiler;
-
-int hash_default(const char *name){
-    int key;
-
-    for(key=0;*name!='\0';name++){
-        key=((key<<8)+ *name )%MAX_HASH;
-    }
-
-    return key;
-}
 
 DllProc *GetDeclareHash(const char *fullName){

branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp

@@ -1 @@
-#pragma warning(disable : 4996)
-
 #include <map>
 #include <string>