Changeset 523 in dev for trunk

Timestamp:

May 1, 2008, 11:03:14 PM (17 years ago)

Author:

dai_9181

Message:

ヘッダファイルを整理中

Location:

trunk/ab5.0

Files:

• abdev/BasicCompiler_Common/BasicCompiler.cpp (modified) (2 diffs)
• abdev/BasicCompiler_Common/Diagnose.cpp (modified) (3 diffs)
• abdev/BasicCompiler_Common/MakeExe.cpp (modified) (2 diffs)
• abdev/BasicCompiler_Common/NonVolatile.cpp (modified) (3 diffs)
• abdev/BasicCompiler_Common/NonVolatile.h (modified) (1 diff)
• abdev/BasicCompiler_Common/NumOpe_GetType.cpp (modified) (1 diff)
• abdev/BasicCompiler_Common/ParamImpl.cpp (modified) (1 diff)
• abdev/BasicCompiler_Common/Subroutine.cpp (modified) (1 diff)
• abdev/BasicCompiler_Common/common.h (modified) (3 diffs)
• abdev/BasicCompiler_Common/hash.cpp (modified) (1 diff)
• abdev/BasicCompiler_Common/include/Class.h (modified) (3 diffs)
• abdev/BasicCompiler_Common/include/Const.h (modified) (2 diffs)
• abdev/BasicCompiler_Common/include/Member.h (modified) (3 diffs)
• abdev/BasicCompiler_Common/include/Method.h (modified) (3 diffs)
• abdev/BasicCompiler_Common/include/Procedure.h (modified) (8 diffs)
• abdev/BasicCompiler_Common/include/Source.h (modified) (4 diffs)
• abdev/BasicCompiler_Common/include/TypeDef.h (modified) (5 diffs)
• abdev/BasicCompiler_Common/include/Variable.h (modified) (2 diffs)
• abdev/BasicCompiler_Common/include/logger.h (modified) (2 diffs)
• abdev/BasicCompiler_Common/include/option.h (modified) (1 diff)
• abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp (modified) (10 diffs)
• abdev/BasicCompiler_Common/src/Class.cpp (modified) (2 diffs)
• abdev/BasicCompiler_Common/src/Compiler.cpp (modified) (6 diffs)
• abdev/BasicCompiler_Common/src/Const.cpp (modified) (3 diffs)
• abdev/BasicCompiler_Common/src/Delegate.cpp (modified) (3 diffs)
• abdev/BasicCompiler_Common/src/Enum.cpp (modified) (3 diffs)
• abdev/BasicCompiler_Common/src/Messenger.cpp (modified) (1 diff)
• abdev/BasicCompiler_Common/src/Method.cpp (modified) (2 diffs)
• abdev/BasicCompiler_Common/src/ObjectModule.cpp (modified) (5 diffs)
• abdev/BasicCompiler_Common/src/Procedure.cpp (modified) (3 diffs)
• abdev/BasicCompiler_Common/src/Source.cpp (modified) (7 diffs)
• abdev/BasicCompiler_Common/src/Type.cpp (modified) (4 diffs)
• abdev/BasicCompiler_Common/src/TypeDef.cpp (modified) (6 diffs)
• abdev/BasicCompiler_Common/src/Variable.cpp (modified) (2 diffs)
• abdev/ab_common/include/Lexical/Namespace.h (modified) (1 diff)
• abdev/abdev/BREGEXP.H (modified) (1 diff)
• abdev/abdev/Common.h (modified) (2 diffs)
• abdev/abdev/DocumentAdvice.cpp (modified) (1 diff)
• abdev/abdev/SubOperation.cpp (modified) (2 diffs)
• abdev/compiler_x86/CParameter.cpp (modified) (2 diffs)
• abdev/compiler_x86/Compile_Calc.cpp (modified) (1 diff)
• abdev/compiler_x86/Compile_Func.cpp (modified) (1 diff)
• abdev/compiler_x86/MakePeHdr.cpp (modified) (1 diff)
• abdev/compiler_x86/NumOpe.cpp (modified) (1 diff)
• abdev/compiler_x86/Opcode.h (modified) (1 diff)
• jenga/include/common/BoostSerializationSupport.h (modified) (2 diffs)
• jenga/include/common/Directory.h (modified) (1 diff)
• jenga/src/common/Directory.cpp (modified) (3 diffs)

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

@@ -171 +171 @@
     lstrcpy(path,temp3);
 }
-void GetFullPath( char *path, const string &baseDirPath ){
+void GetFullPath( char *path, const std::string &baseDirPath ){
     int i,i2,i3,i4;
     char temporary[MAX_PATH];
@@ -590 +590 @@
 
     // グローバルローケルを日本語にする
-    locale::global(locale("japanese"));
+    std::locale::global(std::locale("japanese"));
     _setmode(_fileno(stdout), _O_BINARY);
 

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

@@ -23 +23 @@
         extern int GlobalOpBufferSize;
         sprintf(temporary, "%d", GlobalOpBufferSize/1024 );
-        trace_for_size( (string)"グローバル領域のコードサイズ: " + temporary + "KB" );
+        trace_for_size( (std::string)"グローバル領域のコードサイズ: " + temporary + "KB" );
         //sprintf(temporary, "%d", (obp-GlobalOpBufferSize)/1024 );
-        //trace_for_size( (string)"ローカル領域のコードサイズ: " + temporary + "KB" );
+        //trace_for_size( (std::string)"ローカル領域のコードサイズ: " + temporary + "KB" );
         //sprintf(temporary, "%d", obp/1024 );
-        //trace_for_size( (string)"コードサイズ総量: " + temporary + "KB" );
+        //trace_for_size( (std::string)"コードサイズ総量: " + temporary + "KB" );
     }
 
@@ -52 +52 @@
 
         sprintf(temporary, "%d", codeSizeOfGlobalProc/1024 );
-        trace_for_size( (string)"グローバル関数のコードサイズ総量: " + temporary + "KB" );
+        trace_for_size( (std::string)"グローバル関数のコードサイズ総量: " + temporary + "KB" );
         sprintf(temporary, "%d", codeSizeOfClassMethod/1024 );
-        trace_for_size( (string)"クラスメソッドのコードサイズ総量: " + temporary + "KB" );
+        trace_for_size( (std::string)"クラスメソッドのコードサイズ総量: " + temporary + "KB" );
     }
 
@@ -92 +92 @@
 
         sprintf(temporary, "%d", codeSizeOfEnum/1024 );
-        trace_for_size( (string)"Enumのコードサイズ総量: " + temporary + "KB" );
+        trace_for_size( (std::string)"Enumのコードサイズ総量: " + temporary + "KB" );
     }
 

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

@@ -175 +175 @@
                 if( compiler.staticLibraries.back()->Read( coreFilePath ) )
                 {
-                    compiler.messenger.Output( ((string)"\"" + path.GetFullPath() + "\" を読み込みました。").c_str() );
+                    compiler.messenger.Output( ((std::string)"\"" + path.GetFullPath() + "\" を読み込みました。").c_str() );
                 }
                 else
@@ -198 +198 @@
                 if( compiler.staticLibraries.back()->Read( filePath ) )
                 {
-                    compiler.messenger.Output( ((string)"\"" + path.GetFullPath() + "\" を読み込みました。").c_str() );
+                    compiler.messenger.Output( ((std::string)"\"" + path.GetFullPath() + "\" を読み込みました。").c_str() );
                 }
                 else

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

@@ -4 +4 @@
 
 
-char *ReadBuffer_NonErrMsg( const string &path ){
+char *ReadBuffer_NonErrMsg( const std::string &path ){
     extern HANDLE hHeap;
     int i;
@@ -20 +20 @@
     return buffer;
 }
-_int8 WriteBuffer( const string &path, char *buffer,int length){
+_int8 WriteBuffer( const std::string &path, char *buffer,int length){
     extern HWND hOwnerEditor;
     HANDLE hFile;
@@ -247 +247 @@
     char temporary[MAX_PATH];
 
-    const string userSettingDirPath = Jenga::Common::Environment::GetAppDir() + "\\UserSetting";
+    const std::string userSettingDirPath = Jenga::Common::Environment::GetAppDir() + "\\UserSetting";
 
     HANDLE hFind;

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

@@ -1 +1 @@
 
-char *ReadBuffer_NonErrMsg( const string &path );
+char *ReadBuffer_NonErrMsg( const std::string &path );
 
 class CNonVolatile{

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

@@ -360 +360 @@
     GetVarFormatString( methodName, parameter, lpPtrOffset, dummy, refType, &pareOrBracket );
 
-    vector<const UserProc *> userProcs;
+    std::vector<const UserProc *> userProcs;
     leftType.GetClass().EnumDynamicMethodsOrInterfaceMethods( methodName, userProcs );
     if(userProcs.size()){

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

@@ -312 +312 @@
 }
 
-bool ParamImpl::ErrorCheck( const string &procName, const Parameters &params, int SecondParmNum ){
+bool ParamImpl::ErrorCheck( const std::string &procName, const Parameters &params, int SecondParmNum ){
     if( SecondParmNum == -1 ) SecondParmNum = (int)params.size();
 

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

@@ -306 +306 @@
 bool GetReturnTypeOfIndexerGetterProc( const Type &classType, Type &resultType )
 {
-    vector<const UserProc *> subs;
+    std::vector<const UserProc *> subs;
     classType.GetClass().GetDynamicMethods().Enum( CALC_ARRAY_GET, subs );
     if( subs.size() == 0 ){

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

@@ -5 +5 @@
 
 #include <option.h>
-
-using namespace std;
 
 #ifdef _AMD64_
@@ -218 +216 @@
 void epi_check();
 void GetRelationalPath(char *path,char *dir);
-void GetFullPath( char *path, const string &baseDirPath );
+void GetFullPath( char *path, const std::string &baseDirPath );
 std::string GetApplicationBaseFullPath( const std::string &relationalPath );
 void ShowErrorLine(int LineNum,const char *FileName);
@@ -361 +359 @@
 bool GetReturnTypeOfPropertyMethod( const char *variable, const char *rightSide, Type &resultType );
 bool GetReturnTypeOfIndexerGetterProc( const Type &classType, Type &resultType );
-int AddProcPtrInfo( const string &typeExpression, int nowLine );
+int AddProcPtrInfo( const std::string &typeExpression, int nowLine );
 bool IsNeedProcCompile();
 void CompileLocal();

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

@@ -162 +162 @@
     const CClass *pClass = compiler.GetObjectModule().meta.GetClasses().Find( className );
     if( pClass ){
-        vector<const UserProc *> userProcs;
+        std::vector<const UserProc *> userProcs;
         pClass->EnumDynamicMethodsOrInterfaceMethods( methodName, userProcs );
         if( userProcs.size() == 1 ){

trunk/ab5.0/abdev/BasicCompiler_Common/include/Class.h

@@ -16 +16 @@
 
 public:
-    ClassPrototype( const NamespaceScopes &namespaceScopes, const string &name )
+    ClassPrototype( const NamespaceScopes &namespaceScopes, const std::string &name )
         : Prototype( namespaceScopes, name )
         , DynamicMethodsPrototype()
@@ -106 +106 @@
 public:
 
-    CClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const string &name )
+    CClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const std::string &name )
         : ClassPrototype( namespaceScopes, name )
         , importedNamespaces( importedNamespaces )
@@ -501 +501 @@
     virtual void Compile_System_InitializeUserTypesForBaseType();
 
-    const CClass *Find( const NamespaceScopes &namespaceScopes, const string &name ) const;
-    const CClass *Find( const string &fullName ) const;
+    const CClass *Find( const NamespaceScopes &namespaceScopes, const std::string &name ) const;
+    const CClass *Find( const std::string &fullName ) const;
 
 

trunk/ab5.0/abdev/BasicCompiler_Common/include/Const.h

@@ -75 +75 @@
 
     void Add( const NamespaceScopes &namespaceScopes, char *buffer);
-    void Add( const NamespaceScopes &namespaceScopes, const string &name, char *Expression);
-    void Add( const NamespaceScopes &namespaceScopes, const string &name, int value);
+    void Add( const NamespaceScopes &namespaceScopes, const std::string &name, char *Expression);
+    void Add( const NamespaceScopes &namespaceScopes, const std::string &name, int value);
 
 private:
-    CConst *GetObjectPtr( const string &name );
+    CConst *GetObjectPtr( const std::string &name );
 public:
 
@@ -107 +107 @@
 
 public:
-    ConstMacro( const NamespaceScopes &namespaceScopes, const std::string &name, const std::vector<std::string> &parameters, const string &expression )
+    ConstMacro( const NamespaceScopes &namespaceScopes, const std::string &name, const std::vector<std::string> &parameters, const std::string &expression )
         : Symbol( namespaceScopes, name )
         , parameters( parameters )

trunk/ab5.0/abdev/BasicCompiler_Common/include/Member.h

@@ -7 +7 @@
 #include <Program.h>
 
-using namespace std;
-
 class CClass;
 
 class CMember : public MemberPrototype
 {
-    string name;
+    std::string name;
     Type type;
     bool isConst;
     Subscripts subscripts;
 
-    string initializeExpression;
-    string constructParameter;
+    std::string initializeExpression;
+    std::string constructParameter;
 
     // XMLシリアライズ用
@@ -42 +40 @@
     int source_code_address;
 
-    const string &GetName() const
+    const std::string &GetName() const
     {
         return name;
     }
-    void SetName( const string &name )
+    void SetName( const std::string &name )
     {
         this->name = name;
@@ -70 +68 @@
     }
 
-    const string &GetInitializeExpression() const
+    const std::string &GetInitializeExpression() const
     {
         return initializeExpression;
     }
-    const string &GetConstructParameter() const
+    const std::string &GetConstructParameter() const
     {
         return constructParameter;
     }
 
-    CMember( Prototype::Accessibility accessibility, const string &name, const Type &newType, bool isConst, const Subscripts &subscripts, const string &initializeExpression, const string &constructParameter )
+    CMember( Prototype::Accessibility accessibility, const std::string &name, const Type &newType, bool isConst, const Subscripts &subscripts, const std::string &initializeExpression, const std::string &constructParameter )
         : MemberPrototype( accessibility )
         , name( name )

trunk/ab5.0/abdev/BasicCompiler_Common/include/Method.h

@@ -1 +1 @@
 #pragma once
-
-using namespace std;
 
 class UserProc;
@@ -221 +219 @@
 BOOST_CLASS_EXPORT( StaticMethod );
 
-class Methods : public vector<CMethod *>
+class Methods : public std::vector<CMethod *>
 {
     // XMLシリアライズ用
@@ -256 +254 @@
     const CMethod *GetMethodPtr( const UserProc *pUserProc ) const;
     bool IsExist( const char *name ) const;
-    virtual void Enum( const char *methodName, vector<const UserProc *> &subs ) const;
-    virtual void Enum( BYTE idOperatorCalc, vector<const UserProc *> &subs ) const;
+    virtual void Enum( const char *methodName, std::vector<const UserProc *> &subs ) const;
+    virtual void Enum( BYTE idOperatorCalc, std::vector<const UserProc *> &subs ) const;
 
     // 仮想メソッドの個数を取得

trunk/ab5.0/abdev/BasicCompiler_Common/include/Procedure.h

@@ -57 +57 @@
 
 public:
-    Procedure( const NamespaceScopes &namespaceScopes, const string &name, Kind kind, bool isCdecl )
+    Procedure( const NamespaceScopes &namespaceScopes, const std::string &name, Kind kind, bool isCdecl )
         : Symbol( namespaceScopes, name )
         , kind( kind )
@@ -114 +114 @@
 {
 public:
-    string _paramStr;
+    std::string _paramStr;
 
 private:
@@ -179 +179 @@
 public:
 
-    UserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport )
+    UserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const std::string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport )
         : Procedure( namespaceScopes, name, kind, isCdecl )
         , importedNamespaces( importedNamespaces )
@@ -434 +434 @@
 class DllProc : public Procedure, public Jenga::Common::ObjectInHashmap<DllProc>
 {
-    string dllFileName;
-    string alias;
+    std::string dllFileName;
+    std::string alias;
     int lookupAddress;
 
@@ -452 +452 @@
 
 public:
-    DllProc( const NamespaceScopes &namespaceScopes, const string &name, Kind kind, bool isCdecl, const string &dllFileName, const string &alias )
+    DllProc( const NamespaceScopes &namespaceScopes, const std::string &name, Kind kind, bool isCdecl, const std::string &dllFileName, const std::string &alias )
         : Procedure( namespaceScopes, name, kind, isCdecl )
         , dllFileName( dllFileName )
@@ -481 +481 @@
     }
 
-    const string &GetDllFileName() const
+    const std::string &GetDllFileName() const
     {
         return dllFileName;
     }
-    const string &GetAlias() const
+    const std::string &GetAlias() const
     {
         return alias;
@@ -542 +542 @@
 };
 
-class ProcPointers : public vector<ProcPointer *>
+class ProcPointers : public std::vector<ProcPointer *>
 {
     // XMLシリアライズ用
@@ -564 +564 @@
     }
 
-    int Add( const string &typeExpression );
+    int Add( const std::string &typeExpression );
     void Clear();
     void PullOutAll()

trunk/ab5.0/abdev/BasicCompiler_Common/include/Source.h

@@ -96 +96 @@
     }
 
-    bool ReadFile( const string &filePath );
+    bool ReadFile( const std::string &filePath );
 
     static void Text::SlideString(char *buffer, int slide){
@@ -109 +109 @@
 class BasicSource : public Text
 {
-    static const string generateDirectiveName;
+    static const std::string generateDirectiveName;
 
     IncludedFilesRelation includedFilesRelation;
@@ -186 +186 @@
     void RemoveComments();
 
-    bool ReadFile_InIncludeDirective( const string &filePath );
+    bool ReadFile_InIncludeDirective( const std::string &filePath );
     void DirectiveIncludeOrRequire();
 
@@ -229 +229 @@
     void SetBuffer( const char *buffer );
 
-    bool ReadFile( const string &filePath );
-
-    bool Generate( const string &genName, const char *buffer );
+    bool ReadFile( const std::string &filePath );
+
+    bool Generate( const std::string &genName, const char *buffer );
 
     void Addition( const char *buffer );

trunk/ab5.0/abdev/BasicCompiler_Common/include/TypeDef.h

@@ -6 +6 @@
 #include <Type.h>
 
-using namespace std;
-
 class TypeDefCollection;
 
@@ -14 +12 @@
     friend TypeDefCollection;
 
-    string baseName;
+    std::string baseName;
     Type baseType;
 
@@ -30 +28 @@
 
 public:
-    TypeDef( const NamespaceScopes &namespaceScopes, const string &name, const string &baseName, int nowLine );
+    TypeDef( const NamespaceScopes &namespaceScopes, const std::string &name, const std::string &baseName, int nowLine );
     TypeDef()
     {
@@ -38 +36 @@
     }
 
-    const string &GetBaseName() const
+    const std::string &GetBaseName() const
     {
         return baseName;
@@ -65 +63 @@
     ~TypeDefCollection();
 
-    void Add( const NamespaceScopes &namespaceScopes, const string &name, const string &baseName, int nowLine );
-    int GetIndex( const NamespaceScopes &namespaceScopes, const string &name ) const;
-    int GetIndex( const string &fullName ) const;
+    void Add( const NamespaceScopes &namespaceScopes, const std::string &name, const std::string &baseName, int nowLine );
+    int GetIndex( const NamespaceScopes &namespaceScopes, const std::string &name ) const;
+    int GetIndex( const std::string &fullName ) const;
 
 private:
-    void Add( const NamespaceScopes &namespaceScopes, const string &expression, int nowLine );
+    void Add( const NamespaceScopes &namespaceScopes, const std::string &expression, int nowLine );
 public:
     void CollectTypeDefs();

trunk/ab5.0/abdev/BasicCompiler_Common/include/Variable.h

@@ -57 +57 @@
 
 public:
-    Variable( const string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData );
-    Variable( const NamespaceScopes &namespaceScopes, const string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData );
+    Variable( const std::string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData );
+    Variable( const NamespaceScopes &namespaceScopes, const std::string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData );
     Variable( const Variable &var );
     Variable();
@@ -185 +185 @@
 };
 
-class Variables : public vector<Variable *>
+class Variables : public std::vector<Variable *>
 {
 protected:

trunk/ab5.0/abdev/BasicCompiler_Common/include/logger.h

@@ -84 +84 @@
 inline void basic_dbg_streambuf<char>::dbg_out(const char *str)
 {
-    ofstream ofs( ( saveFilePath ).c_str(), ios_base::app );
+    std::ofstream ofs( ( saveFilePath ).c_str(), std::ios_base::app );
     ofs << "[" << (count++) << "] " << str ;
     ofs.close();
@@ -100 +100 @@
 {
 public:
-    basic_dbg_ostream( const string &saveFilePath, bool isOptionEnabled )
+    basic_dbg_ostream( const std::string &saveFilePath, bool isOptionEnabled )
         : std::basic_ostream<Ch_T, Tr_T>(new basic_dbg_streambuf<Ch_T, Tr_T>(saveFilePath,isOptionEnabled))
     {
-        ofstream ofs( ( saveFilePath ).c_str(), ios_base::trunc );
+        std::ofstream ofs( ( saveFilePath ).c_str(), std::ios_base::trunc );
         ofs.close();
     }

trunk/ab5.0/abdev/BasicCompiler_Common/include/option.h

@@ -37 +37 @@
 
 #ifdef USE_TRACE
-#define trace(s) Program::logger << s << endl
+#define trace(s) Program::logger << s << std::endl
 #else
 #define trace(s)

trunk/ab5.0/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp

@@ -53 +53 @@
     MessageBox( NULL, msg, "XMLシリアライズの例外", MB_OK );
 }
-template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadXml( istream& ifs, bool isShowExceptionMessage )
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadXml( std::istream& ifs, bool isShowExceptionMessage )
 {
     bool isSuccessful = false;
@@ -86 +86 @@
     return true;
 }
-template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteXml( ostream& ofs, bool isShowExceptionMessage ) const
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteXml( std::ostream& ofs, bool isShowExceptionMessage ) const
 {
     bool isSuccessful = false;
@@ -119 +119 @@
     return true;
 }
-template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadXml( const string &xmlFilePath, bool isShowExceptionMessage )
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadXml( const std::string &xmlFilePath, bool isShowExceptionMessage )
 {
     // 入力アーカイブの作成
@@ -131 +131 @@
     return result;
 }
-template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteXml( const string &xmlFilePath, bool isShowExceptionMessage ) const
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteXml( const std::string &xmlFilePath, bool isShowExceptionMessage ) const
 {
     // 出力アーカイブの作成
@@ -201 +201 @@
 }
 
-template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadBinaryFile( const string &filePath, bool isShowExceptionMessage )
-{
-    // 入力アーカイブの作成
-    std::ifstream ifs( filePath.c_str(), ios::in | ios::binary );
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadBinaryFile( const std::string &filePath, bool isShowExceptionMessage )
+{
+    // 入力アーカイブの作成
+    std::ifstream ifs( filePath.c_str(), std::ios::in | std::ios::binary );
 
     bool isSuccessful = false;
@@ -239 +239 @@
     return true;
 }
-template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteBinaryFile( const string &filePath, bool isShowExceptionMessage ) const
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteBinaryFile( const std::string &filePath, bool isShowExceptionMessage ) const
 {
     // 出力アーカイブの作成
-    std::ofstream ofs( filePath.c_str(), ios::out | ios::binary );
+    std::ofstream ofs( filePath.c_str(), std::ios::out | std::ios::binary );
 
     bool isSuccessful = false;
@@ -283 +283 @@
 
     // 入力アーカイブの作成
-    std::istringstream iss( binaryString, ios::in | ios::binary );
+    std::istringstream iss( binaryString, std::ios::in | std::ios::binary );
 
     try{
@@ -306 +306 @@
 {
     // 出力アーカイブの作成
-    std::ostringstream oss( "", ios::out | ios::binary );
+    std::ostringstream oss( "", std::ios::out | std::ios::binary );
 
     bool isSuccessful = false;
@@ -332 +332 @@
 /*
 ビルドに時間がかかるので外しておく
-template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadText( const string &filePath, bool isShowExceptionMessage )
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadText( const std::string &filePath, bool isShowExceptionMessage )
 {
     // 入力アーカイブの作成
@@ -370 +370 @@
     return true;
 }
-template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteText( const string &filePath, bool isShowExceptionMessage ) const
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteText( const std::string &filePath, bool isShowExceptionMessage ) const
 {
     // 出力アーカイブの作成

trunk/ab5.0/abdev/BasicCompiler_Common/src/Class.cpp

@@ -1099 +1099 @@
 }
 
-const CClass *Classes::Find( const NamespaceScopes &namespaceScopes, const string &name ) const
+const CClass *Classes::Find( const NamespaceScopes &namespaceScopes, const std::string &name ) const
 {
     if( namespaceScopes.size() == 0 && name == "Object" ){
@@ -1145 +1145 @@
     return NULL;
 }
-const CClass *Classes::Find( const string &fullName ) const
+const CClass *Classes::Find( const std::string &fullName ) const
 {
     char AreaName[VN_SIZE] = "";        //オブジェクト変数

trunk/ab5.0/abdev/BasicCompiler_Common/src/Compiler.cpp

@@ -15 +15 @@
 }
 
-bool Compiler::StringToType( const string &typeName, Type &type ){
+bool Compiler::StringToType( const std::string &typeName, Type &type ){
     type.SetIndex( -1 );
 
@@ -85 +85 @@
         }
 
-        const string &nextTypeName = typeName.substr( 1 );
+        const std::string &nextTypeName = typeName.substr( 1 );
 
         if( !StringToType( nextTypeName, type ) ){
@@ -166 +166 @@
 }
 
-const string Compiler::TypeToString( const Type &type )
+const std::string Compiler::TypeToString( const Type &type )
 {
     if( PTR_LEVEL( type.GetBasicType() ) ){
@@ -173 +173 @@
         tempType.PtrLevelDown();
 
-        return (string)"*" + TypeToString( tempType );
+        return (std::string)"*" + TypeToString( tempType );
     }
     else if( type.IsObject() || type.IsStruct() ){
@@ -202 +202 @@
         if( lpszTypeName )
         {
-            return (const string)lpszTypeName;
+            return (const std::string)lpszTypeName;
         }
     }
@@ -208 +208 @@
     compiler.errorMessenger.Output(1, NULL, cp);
 
-    return (string)"(null)";
+    return (std::string)"(null)";
 }

trunk/ab5.0/abdev/BasicCompiler_Common/src/Const.cpp

@@ -49 +49 @@
 }
 
-void Consts::Add( const NamespaceScopes &namespaceScopes, const string &name , char *Expression)
+void Consts::Add( const NamespaceScopes &namespaceScopes, const std::string &name , char *Expression)
 {
     _int64 i64data;
@@ -67 +67 @@
     Put( newconst );
 }
-void Consts::Add(const NamespaceScopes &namespaceScopes, const string &name, int value){
+void Consts::Add(const NamespaceScopes &namespaceScopes, const std::string &name, int value){
     CConst *newconst = new CConst( namespaceScopes, name, value);
 
@@ -74 +74 @@
 }
 
-CConst *Consts::GetObjectPtr( const string &name ){
+CConst *Consts::GetObjectPtr( const std::string &name ){
     char ObjName[VN_SIZE];      //オブジェクト変数
     char NestMember[VN_SIZE];   //入れ子メンバ

trunk/ab5.0/abdev/BasicCompiler_Common/src/Delegate.cpp

@@ -214 +214 @@
             values.insert( std::map<std::string,std::string>::value_type(
                 "#call_method_begin#",
-                (string)"Function Call(" + dg.paramStr + ") As " + dg.returnTypeName
+                (std::string)"Function Call(" + dg.paramStr + ") As " + dg.returnTypeName
             ) );
 
@@ -228 +228 @@
             values.insert( std::map<std::string,std::string>::value_type(
                 "#call_method_begin#",
-                (string)"Sub Call(" + dg.paramStr + ")"
+                (std::string)"Sub Call(" + dg.paramStr + ")"
             ) );
 
@@ -244 +244 @@
     }
 /*
-    ofstream ofs( ( Jenga::Common::Environment::GetAppDir() + "\\generated_delegate_code.log" ).c_str() );
+    std::ofstream ofs( ( Jenga::Common::Environment::GetAppDir() + "\\generated_delegate_code.log" ).c_str() );
     ofs << destSource;
     ofs.close();

trunk/ab5.0/abdev/BasicCompiler_Common/src/Enum.cpp

@@ -170 +170 @@
     BOOST_FOREACH( const EnumInfo &enumInfo, thisEnumInfoCollection )
     {
-        BOOST_FOREACH( const string &namespaceStr, enumInfo.GetNamespaceScopes() ){
+        BOOST_FOREACH( const std::string &namespaceStr, enumInfo.GetNamespaceScopes() ){
             sprintf(buffer+length,"Namespace %s\n",namespaceStr.c_str());
             length+=lstrlen(buffer+length);
@@ -214 +214 @@
         length+=lstrlen(buffer+length);
 
-        BOOST_FOREACH( const string &namespaceStr, enumInfo.GetNamespaceScopes() ){
+        BOOST_FOREACH( const std::string &namespaceStr, enumInfo.GetNamespaceScopes() ){
             lstrcpy( buffer+length, "End Namespace\n" );
             length+=lstrlen(buffer+length);
@@ -230 +230 @@
     // ログを生成
     Jenga::Common::Logger logger( Jenga::Common::Environment::GetAppDir() + "\\enum_generated.log", false );
-    logger << buffer << endl;
+    logger << buffer << std::endl;
 #endif
 

trunk/ab5.0/abdev/BasicCompiler_Common/src/Messenger.cpp

@@ -25 +25 @@
 
     // 標準出力
-    std::cout << message << endl;
+    std::cout << message << std::endl;
 }
 int Messenger::GetNextErrorLine()

trunk/ab5.0/abdev/BasicCompiler_Common/src/Method.cpp

@@ -103 +103 @@
     return false;
 }
-void Methods::Enum( const char *methodName, vector<const UserProc *> &subs ) const
+void Methods::Enum( const char *methodName, std::vector<const UserProc *> &subs ) const
 {
     //オブジェクトのメンバ関数の場合
@@ -114 +114 @@
     }
 }
-void Methods::Enum( BYTE idOperatorCalc, vector<const UserProc *> &subs ) const
+void Methods::Enum( BYTE idOperatorCalc, std::vector<const UserProc *> &subs ) const
 {
     //オブジェクトのメンバ関数の場合

trunk/ab5.0/abdev/BasicCompiler_Common/src/ObjectModule.cpp

@@ -48 +48 @@
 #include <boost/serialization/version.hpp>
 #include <boost/serialization/is_abstract.hpp>
+#include <boost/serialization/serialization.hpp>
+#include <boost/serialization/nvp.hpp>
+#include <boost/serialization/export.hpp>
 
 #include <jenga/include/jenga.h>
@@ -113 +116 @@
         boost::archive::xml_iarchive ia(ifs);
 #else
-        std::ifstream ifs( filePath.c_str(), ios::in | ios::binary );
+        std::ifstream ifs( filePath.c_str(), std::ios::in | std::ios::binary );
         boost::archive::binary_iarchive ia(ifs);
 #endif
@@ -146 +149 @@
         boost::archive::xml_oarchive oa(ofs);
 #else
-        std::ofstream ofs( filePath.c_str(), ios::out | ios::binary );
+        std::ofstream ofs( filePath.c_str(), std::ios::out | std::ios::binary );
         boost::archive::binary_oarchive oa(ofs);
 #endif
@@ -181 +184 @@
         boost::archive::xml_iarchive ia(iss);
 #else
-        std::istringstream iss( str, ios::in | ios::binary );
+        std::istringstream iss( str, std::ios::in | std::ios::binary );
         boost::archive::binary_iarchive ia(iss);
 #endif
@@ -215 +218 @@
         boost::archive::xml_oarchive oa(oss);
 #else
-        std::ostringstream oss( "", ios::out | ios::binary );
+        std::ostringstream oss( "", std::ios::out | std::ios::binary );
         boost::archive::binary_oarchive oa(oss);
 #endif

trunk/ab5.0/abdev/BasicCompiler_Common/src/Procedure.cpp

@@ -458 +458 @@
     if( this->pParentClass && isStatic == false ){
         //オブジェクトメンバの場合は、第一パラメータを_System_LocalThis引き渡し用として利用
-        string name = "_System_LocalThis";
+        std::string name = "_System_LocalThis";
         Type type( DEF_PTR_VOID );
         this->realParams.push_back( new Parameter( name, type ) );
@@ -467 +467 @@
         //※第一パラメータ（Thisポインタありの場合は第二パラメータ）を戻り値用の参照宣言にする
 
-        string name = this->GetName();
+        std::string name = this->GetName();
         if(name[0]==1&&name[1]==ESC_OPERATOR){
             name="_System_ReturnValue";
@@ -1004 +1004 @@
 }
 
-int ProcPointers::Add( const string &typeExpression )
+int ProcPointers::Add( const std::string &typeExpression )
 {
     DWORD dwProcType = (DWORD)typeExpression[2];
-    const string &paramStr = typeExpression.substr( 3 );
+    const std::string &paramStr = typeExpression.substr( 3 );
 
     Procedure::Kind kind = Procedure::Sub;

trunk/ab5.0/abdev/BasicCompiler_Common/src/Source.cpp

@@ -1 +1 @@
 #include "stdafx.h"
 
-const string BasicSource::generateDirectiveName = "#generate";
+const std::string BasicSource::generateDirectiveName = "#generate";
 
 
 class CDefine{
-    vector<string> names;
+    std::vector<std::string> names;
 public:
     CDefine( int majorVer );
@@ -138 +138 @@
 }
 BOOL CDefine::undef(char *name){
-    vector<string>::iterator i = names.begin();
-    BOOST_FOREACH( const string &temp, names ){
+    std::vector<std::string>::iterator i = names.begin();
+    BOOST_FOREACH( const std::string &temp, names ){
         if( temp == name ){
             names.erase( i );
@@ -152 +152 @@
 
     //重複チェック
-    BOOST_FOREACH( const string &temp, names ){
+    BOOST_FOREACH( const std::string &temp, names ){
         if( temp == name ){
             return 1;
@@ -390 +390 @@
 
 
-bool Text::ReadFile( const string &filePath ){
+bool Text::ReadFile( const std::string &filePath ){
     //ファイルオープン
     HANDLE hFile=CreateFile(filePath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
@@ -519 +519 @@
 }
 
-bool BasicSource::ReadFile_InIncludeDirective( const string &filePath ){
+bool BasicSource::ReadFile_InIncludeDirective( const std::string &filePath ){
     if( !Text::ReadFile( filePath ) ){
         return false;
@@ -854 +854 @@
 }
 
-bool BasicSource::ReadFile( const string &filePath ){
+bool BasicSource::ReadFile( const std::string &filePath ){
     if( !Text::ReadFile( filePath ) ){
         return false;
@@ -902 +902 @@
 }
 
-bool BasicSource::Generate( const string &genName, const char *genBuffer ){
+bool BasicSource::Generate( const std::string &genName, const char *genBuffer ){
     const int genBufferLength = lstrlen( genBuffer );
 

trunk/ab5.0/abdev/BasicCompiler_Common/src/Type.cpp

@@ -2 +2 @@
 
 #include <Class.h>
-
-using namespace std;
 
 const int Type::basicTypeList[] = {
@@ -27 +25 @@
 };
 
-const string Type::basicTypeNameList[] = {
+const std::string Type::basicTypeNameList[] = {
     "Byte",
     "SByte",
@@ -53 +51 @@
 }
 
-bool Type::StringToBasicType( const string &typeName, int &basicType ){
+bool Type::StringToBasicType( const std::string &typeName, int &basicType ){
     for( int i=0; ; i++ ){
         if( basicTypeList[i] == DEF_NON ){
@@ -615 +613 @@
 
 
-const string BlittableType::GetCreateStaticMethodFullName() const
+const std::string BlittableType::GetCreateStaticMethodFullName() const
 {
     return pClass->GetNamespaceScopes().ToString() + "." + pClass->GetName() + "._Create";

trunk/ab5.0/abdev/BasicCompiler_Common/src/TypeDef.cpp

@@ -4 +4 @@
 #include <Compiler.h>
 
-TypeDef::TypeDef( const NamespaceScopes &namespaceScopes, const string &name, const string &baseName, int nowLine )
+TypeDef::TypeDef( const NamespaceScopes &namespaceScopes, const std::string &name, const std::string &baseName, int nowLine )
     : Symbol( namespaceScopes, name )
     , baseName( baseName )
@@ -14 +14 @@
 }
 /*
-bool TypeDef::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
+bool TypeDef::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const std::string &name ) const
 {
     if( GetName() != name ){
@@ -21 +21 @@
     return compiler.GetNamespaceSupporter().IsSameAreaNamespace( this->namespaceScopes, namespaceScopes );
 }
-bool TypeDef::IsEqualSymbol( const string &fullName ) const
+bool TypeDef::IsEqualSymbol( const std::string &fullName ) const
 {
     char AreaName[VN_SIZE] = "";        //オブジェクト変数
@@ -52 +52 @@
 TypeDefCollection::~TypeDefCollection(){
 }
-void TypeDefCollection::Add( const NamespaceScopes &namespaceScopes, const string &name, const string &baseName, int nowLine ){
+void TypeDefCollection::Add( const NamespaceScopes &namespaceScopes, const std::string &name, const std::string &baseName, int nowLine ){
     TypeDef typeDef( namespaceScopes, name, baseName, nowLine );
     this->push_back( typeDef );
 }
-int TypeDefCollection::GetIndex( const NamespaceScopes &namespaceScopes, const string &name ) const{
+int TypeDefCollection::GetIndex( const NamespaceScopes &namespaceScopes, const std::string &name ) const{
     int max = (int)(*this).size();
     for( int i=0; i<max; i++ ){
@@ -65 +65 @@
     return -1;
 }
-int TypeDefCollection::GetIndex( const string &fullName ) const{
+int TypeDefCollection::GetIndex( const std::string &fullName ) const{
     char AreaName[VN_SIZE] = "";        //オブジェクト変数
     char NestName[VN_SIZE] = "";        //入れ子メンバ
@@ -73 +73 @@
 }
 
-void TypeDefCollection::Add( const NamespaceScopes &namespaceScopes, const string &expression, int nowLine ){
+void TypeDefCollection::Add( const NamespaceScopes &namespaceScopes, const std::string &expression, int nowLine ){
     int i;
     char temporary[VN_SIZE];

trunk/ab5.0/abdev/BasicCompiler_Common/src/Variable.cpp

@@ -4 +4 @@
 #include <Variable.h>
 
-Variable::Variable( const string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData )
+Variable::Variable( const std::string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData )
     : Symbol( ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( name ) )
     , type( type )
@@ -15 +15 @@
 {
 }
-Variable::Variable( const NamespaceScopes &namespaceScopes, const string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData )
+Variable::Variable( const NamespaceScopes &namespaceScopes, const std::string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData )
     : Symbol( namespaceScopes, name )
     , type( type )

trunk/ab5.0/abdev/ab_common/include/Lexical/Namespace.h

@@ -12 +12 @@
     template<class Archive> void serialize(Archive& ar, const unsigned int version)
     {
-        ar & boost::serialization::make_nvp("vector_string", boost::serialization::base_object<vector<string>>(*this));
+        ar & boost::serialization::make_nvp("vector_string", boost::serialization::base_object<std::vector<std::string>>(*this));
     }
 

trunk/ab5.0/abdev/abdev/BREGEXP.H

@@ -27 +27 @@
 
 typedef struct bregexp {
-    const char *outp;           /* result string start ptr   */
-    const char *outendp;        /* result string end ptr     */ 
+    const char *outp;           /* result std::string start ptr   */
+    const char *outendp;        /* result std::string end ptr     */ 
     const int  splitctr;        /* split result counter     */ 
     const char **splitp;        /* split result pointer ptr     */ 

trunk/ab5.0/abdev/abdev/Common.h

@@ -19 +19 @@
 #include <string>
 #include <fstream>
-
-using namespace std;
 
 #include "nkf_class.h"
@@ -867 +865 @@
 BOOL SetRunning(HWND hChild);
 BOOL IsNeedCompile(char *FileName,BOOL bDebug);
-string GetLastErrorString();
+std::string GetLastErrorString();
 
 //DocumentAdvice.cpp

trunk/ab5.0/abdev/abdev/DocumentAdvice.cpp

@@ -65 +65 @@
     else if(LOWORD(msg)==IDM_ALLSELECT) SetStatusText("Select the entire document");
     else if(LOWORD(msg)==IDM_FIND) SetStatusText("Search for text in the active document");
-    else if(LOWORD(msg)==IDM_PERMUTATION) SetStatusText("Replace occurrences of search string");
+    else if(LOWORD(msg)==IDM_PERMUTATION) SetStatusText("Replace occurrences of search std::string");
     else if(LOWORD(msg)==IDM_PROJECTVIEW) SetStatusText("Show or hide ProjectView");
     else if(LOWORD(msg)==IDM_PROJECT_OPTION) SetStatusText("Set project options");

trunk/ab5.0/abdev/abdev/SubOperation.cpp

@@ -1527 +1527 @@
 }
 
-string GetLastErrorString(){
+std::string GetLastErrorString(){
     char *lpMsgBuf;
 
@@ -1542 +1542 @@
     );
 
-    string result = lpMsgBuf;
+    std::string result = lpMsgBuf;
 
     LocalFree( lpMsgBuf );

trunk/ab5.0/abdev/compiler_x86/CParameter.cpp

@@ -6 +6 @@
 #include "opcode.h"
 
-int ParamImpl::NewTempParameters( const string &procName, const Parameters &params, int SecondParmNum ){
+int ParamImpl::NewTempParameters( const std::string &procName, const Parameters &params, int SecondParmNum ){
     if( SecondParmNum == -1 ) SecondParmNum = (int)params.size();
 
@@ -174 +174 @@
 }
 
-int ParamImpl::SetParameter( const string &procName, const Parameters &params, int SecondParmNum, const UserProc *pUserProc ){
+int ParamImpl::SetParameter( const std::string &procName, const Parameters &params, int SecondParmNum, const UserProc *pUserProc ){
     if( SecondParmNum == -1 ) SecondParmNum = (int)params.size();
 

trunk/ab5.0/abdev/compiler_x86/Compile_Calc.cpp

@@ -611 +611 @@
     if( varType.IsObject() && compiler.GetObjectModule().meta.GetBlittableTypes().IsExist( calcType ) ){
         // Blittable型をオブジェクトとして扱う
-        vector<const UserProc *> userProcs;
+        std::vector<const UserProc *> userProcs;
         compiler.GetObjectModule().meta.GetBlittableTypes().GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs );
         if( userProcs.size() != 1 ){

trunk/ab5.0/abdev/compiler_x86/Compile_Func.cpp

@@ -524 +524 @@
     }
 }
-void Opcode_Func_SizeOf( const string &typeName ){
+void Opcode_Func_SizeOf( const std::string &typeName ){
     Type tempType;
     if( !compiler.StringToType( typeName, tempType ) ){

trunk/ab5.0/abdev/compiler_x86/MakePeHdr.cpp

@@ -349 +349 @@
 #ifdef _DEBUG
     {
-        ofstream ofs( ( Jenga::Common::Environment::GetAppDir() + "\\middle_code.txt" ).c_str() );
-        ofs << basbuf << endl;
+        std::ofstream ofs( ( Jenga::Common::Environment::GetAppDir() + "\\middle_code.txt" ).c_str() );
+        ofs << basbuf << std::endl;
         ofs.close();
     }

trunk/ab5.0/abdev/compiler_x86/NumOpe.cpp

@@ -255 +255 @@
     // 動的メソッドを検索
     ///////////////////////////////////////////////////////////////////
-    vector<const UserProc *> userProcs;
+    std::vector<const UserProc *> userProcs;
 
     char methodName[VN_SIZE], lpPtrOffset[VN_SIZE], parameter[VN_SIZE], dummy[1];

trunk/ab5.0/abdev/compiler_x86/Opcode.h

@@ -197 +197 @@
 
     void ApplyDefaultParameters( const Parameters &params );
-    bool ErrorCheck( const string &procName, const Parameters &params, int SecondParmNum = -1 );
+    bool ErrorCheck( const std::string &procName, const Parameters &params, int SecondParmNum = -1 );
     void MacroParameterSupport( const Parameters &params );
     void SetStructParameter( const Type &baseType, const char *expression );
-    int SetParameter( const string &procName, const Parameters &params, int SecondParmNum = -1, const UserProc *pUserProc = NULL );
+    int SetParameter( const std::string &procName, const Parameters &params, int SecondParmNum = -1, const UserProc *pUserProc = NULL );
 
     //一時オブジェクトパラメータの生成と破棄
-    int NewTempParameters( const string &procName, const Parameters &params, int SecondParmNum = -1 );
+    int NewTempParameters( const std::string &procName, const Parameters &params, int SecondParmNum = -1 );
     void DeleteTempParameters();
 };

trunk/ab5.0/jenga/include/common/BoostSerializationSupport.h

@@ -1 +1 @@
 #pragma once
-
-#include <vector>
-#include <string>
-#include <fstream>
-#include <sstream>
-
-#include <boost/serialization/serialization.hpp>
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/export.hpp>
 
 namespace Jenga{
 namespace Common{
-
-using namespace std;
 
 template<class T_xml_schema> class BoostSerializationSupport{
@@ -21 +10 @@
 
 public:
-    bool ReadXml( istream& ifs, bool isShowExceptionMessage = true );
-    bool WriteXml( ostream& ofs, bool isShowExceptionMessage = true ) const;
+    bool ReadXml( std::istream& ifs, bool isShowExceptionMessage = true );
+    bool WriteXml( std::ostream& ofs, bool isShowExceptionMessage = true ) const;
     bool ReadXml( const std::string &xmlFilePath, bool isShowExceptionMessage = true );
     bool WriteXml( const std::string &xmlFilePath, bool isShowExceptionMessage = true ) const;

trunk/ab5.0/jenga/include/common/Directory.h

@@ -1 +1 @@
 #pragma once
-#pragma warning(disable : 4996)
-
-#include <vector>
-#include <string>
-
-#include <stdlib.h>
-
-#include <windows.h>
-
 
 namespace Jenga{
 namespace Common{
 
-using namespace std;
-
 class Directory
 {
-    string path;
+    std::string path;
 public:
-    Directory( const string &path, bool isMake = false );
+    Directory( const std::string &path, bool isMake = false );
 
-    string GetFullPath( const string &relationPath );
-
-    string GetRelationalPath( const string &fullPath )
-    {
-    }
+    std::string GetFullPath( const std::string &relationPath );
 };
 

trunk/ab5.0/jenga/src/common/Directory.cpp

@@ -1 +1 @@
 #include "stdafx.h"
 
-using namespace std;
 using namespace Jenga::Common;
 
-Directory::Directory( const string &path, bool isMake )
+Directory::Directory( const std::string &path, bool isMake )
     : path( path )
 {
@@ -16 +15 @@
 }
 
-string Directory::GetFullPath( const string &relationPath )
+std::string Directory::GetFullPath( const std::string &relationPath )
 {
-    string resultPath = relationPath;
+    std::string resultPath = relationPath;
 
     // '/'→'\'
@@ -29 +28 @@
     }
 
-    if( resultPath.find( ":" ) != string::npos || resultPath.find( "\\\\" ) != string::npos )
+    if( resultPath.find( ":" ) != std::string::npos || resultPath.find( "\\\\" ) != std::string::npos )
     {
         // フルパスが引き渡されていたとき