Changeset 523 in dev for trunk/ab5.0/jenga

Timestamp:

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

Author:

dai_9181

Message:

ヘッダファイルを整理中

Location:

trunk/ab5.0/jenga

Files:

• include/common/BoostSerializationSupport.h (modified) (2 diffs)
• include/common/Directory.h (modified) (1 diff)
• src/common/Directory.cpp (modified) (3 diffs)

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 )
     {
         // フルパスが引き渡されていたとき