Index: trunk/ab5.0/abdev/BasicCompiler_Common/include/Binary.h
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/include/Binary.h	(revision 528)
+++ 	(revision )
@@ -1,165 +1,0 @@
-#pragma once
-
-
-class Binary
-{
-	int allocateSize;
-	char *buffer;
-	int size;
-
-	// XMLシリアライズ用
-private:
-	friend class boost::serialization::access;
-	BOOST_SERIALIZATION_SPLIT_MEMBER();
-	template<class Archive> void load(Archive& ar, const unsigned int version)
-	{
-		trace_for_serialize( "serializing(load) - Binary" );
-
-		std::string _buffer;
-		ar & BOOST_SERIALIZATION_NVP( _buffer );
-		ar & BOOST_SERIALIZATION_NVP( size );
-
-		// 読み込み後の処理
-		Realloc( size );
-		for( int i=0; i<size; i++ )
-		{
-			ULONG_PTR l1 = ( ( _buffer[i*3] >= 'a' ) ? ( _buffer[i*3] - 'a' + 0x0a ) : ( _buffer[i*3] - '0' ) ) * 0x10;
-			ULONG_PTR l2 = ( _buffer[i*3+1] >= 'a' ) ? ( _buffer[i*3+1] - 'a' + 0x0a ) : ( _buffer[i*3+1] - '0' );
-			ULONG_PTR l = l1 + l2;
-			buffer[i] = static_cast<char>(l);
-		}
-	}
-	template<class Archive> void save(Archive& ar, const unsigned int version) const
-	{
-		trace_for_serialize( "serializing(save) - Binary" );
-
-		// 保存準備
-		char *tempCode = (char *)calloc( (size+1) * 3, 1 );
-		for( int i=0; i<size; i++ )
-		{
-			char temp[32];
-			sprintf( temp, "%02x,", (unsigned char)buffer[i] );
-			tempCode[i*3] = temp[0];
-			tempCode[i*3+1] = temp[1];
-			tempCode[i*3+2] = temp[2];
-		}
-
-		std::string _buffer = tempCode;
-		free( tempCode );
-
-		ar & BOOST_SERIALIZATION_NVP( _buffer );
-		ar & BOOST_SERIALIZATION_NVP( size );
-	}
-
-	void Realloc( int newSize )
-	{
-		if( allocateSize < newSize + 8192 )
-		{
-			while( allocateSize < newSize + 8192 )
-			{
-				allocateSize += 8192;
-			}
-			buffer = (char *)realloc( buffer, allocateSize );
-
-			// 再確保した部分を0で埋める
-			memset( buffer + size, 0, allocateSize - size );
-		}
-	}
-
-public:
-	Binary()
-		: allocateSize( 8192 )
-		, buffer( (char *)malloc( allocateSize ) )
-		, size( 0 )
-	{
-	}
-	Binary( const char *buffer, int size )
-		: allocateSize( 8192 )
-		, buffer( (char *)malloc( allocateSize ) )
-		, size( 0 )
-	{
-		Put( buffer, size );
-	}
-	~Binary()
-	{
-		free( buffer );
-	}
-
-	void Clear()
-	{
-		size = 0;
-	}
-
-	const char *GetBuffer() const
-	{
-		return buffer;
-	}
-	int GetSize() const
-	{
-		return size;
-	}
-	void Resize( int newSize )
-	{
-		Realloc( newSize );
-		size = newSize;
-	}
-
-	long GetLong( int pos ) const
-	{
-		return *(long *)( buffer + pos );
-	}
-
-	void Overwrite( int pos, const char *buffer, int size )
-	{
-		memcpy( this->buffer + pos, buffer, size );
-	}
-	void Overwrite( int pos, char c )
-	{
-		buffer[pos] = c;
-	}
-	void Overwrite( int pos, long newLongValue )
-	{
-		*(long *)( buffer + pos ) = newLongValue;
-	}
-	void Overwrite( int pos, _int64 newInt64Value )
-	{
-		*(_int64 *)( buffer + pos ) = newInt64Value;
-	}
-
-	void Put( const char *buffer, int size )
-	{
-		Realloc( this->size + size );
-
-		memcpy( this->buffer + this->size, buffer, size );
-		this->size += size;
-	}
-	void Put( double dbl )
-	{
-		Put( (const char *)(&dbl), sizeof(double) );
-	}
-	void Put( float flt )
-	{
-		Put( (const char *)(&flt), sizeof(float) );
-	}
-	void Put( _int64 i64data )
-	{
-		Put( (const char *)(&i64data), sizeof(_int64) );
-	}
-	void Put( long l )
-	{
-		Realloc( size + sizeof(long) );
-		*((long *)(buffer+size))=l;
-		size += sizeof(long);
-	}
-	void Put( short s )
-	{
-		Realloc( size + sizeof(short) );
-		*((short *)(buffer+size))=s;
-		size += sizeof(short);
-	}
-	void Put( char c )
-	{
-		Realloc( size + 1 );
-		buffer[size++] = c;
-	}
-};
Index: trunk/ab5.0/abdev/BasicCompiler_Common/include/NativeCode.h
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/include/NativeCode.h	(revision 528)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/include/NativeCode.h	(revision 529)
@@ -196,5 +196,5 @@
 typedef std::vector<SourceLine> SourceLines;
 
-class NativeCode : public Binary
+class NativeCode : public Jenga::Common::Binary
 {
 	// リンカで解決しなければならないスケジュール
@@ -211,5 +211,5 @@
 		trace_for_serialize( "serializing(load) - NativeCode" );
 
-		ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Binary );
+		ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Jenga::Common::Binary );
 		ar & BOOST_SERIALIZATION_NVP( schedules );
 		ar & BOOST_SERIALIZATION_NVP( sourceLines );
@@ -218,14 +218,14 @@
 public:
 	NativeCode()
-		: Binary()
+		: Jenga::Common::Binary()
 	{
 	}
 	NativeCode( const NativeCode &nativeCode )
-		: Binary()
+		: Jenga::Common::Binary()
 	{
 		PutEx( nativeCode );
 	}
 	NativeCode( const char *codeBuffer, int size )
-		: Binary( codeBuffer, size )
+		: Jenga::Common::Binary( codeBuffer, size )
 	{
 	}
Index: trunk/ab5.0/abdev/BasicCompiler_Common/include/Variable.h
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/include/Variable.h	(revision 528)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/include/Variable.h	(revision 529)
@@ -231,5 +231,5 @@
 {
 public:
-	Binary initAreaBuffer;
+	Jenga::Common::Binary initAreaBuffer;
 
 	// XMLシリアライズ用
Index: trunk/ab5.0/abdev/BasicCompiler_Common/src/ObjectModule.cpp
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/src/ObjectModule.cpp	(revision 528)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/src/ObjectModule.cpp	(revision 529)
@@ -63,5 +63,4 @@
 using namespace ActiveBasic::Common::Lexical;
 
-#include <Binary.h>
 #include <NativeCode.h>
 #include <Source.h>
Index: trunk/ab5.0/abdev/compiler_x64/compiler_x64.vcproj
===================================================================
--- trunk/ab5.0/abdev/compiler_x64/compiler_x64.vcproj	(revision 528)
+++ trunk/ab5.0/abdev/compiler_x64/compiler_x64.vcproj	(revision 529)
@@ -310,12 +310,4 @@
 				>
 				<File
-					RelativePath="..\BasicCompiler_Common\include\BoostSerializationSupport.h"
-					>
-				</File>
-				<File
-					RelativePath="..\BasicCompiler_Common\include\Hashmap.h"
-					>
-				</File>
-				<File
 					RelativePath="..\BasicCompiler_Common\include\logger.h"
 					>
@@ -1209,30 +1201,4 @@
 			</Filter>
 			<Filter
-				Name="Common Classes"
-				>
-				<File
-					RelativePath="..\BasicCompiler_Common\src\BoostSerializationSupport.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalOptions="/bigobj"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalOptions="/bigobj"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
 				Name="Compiler Classes"
 				>
@@ -1368,4 +1334,20 @@
 					RelativePath="..\BasicCompiler_Common\src\Program.cpp"
 					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Common Classes"
+				>
+				<File
+					RelativePath="..\BasicCompiler_Common\src\BoostSerializationSupport.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 				</File>
 			</Filter>
Index: trunk/ab5.0/abdev/compiler_x64/stdafx.h
===================================================================
--- trunk/ab5.0/abdev/compiler_x64/stdafx.h	(revision 528)
+++ trunk/ab5.0/abdev/compiler_x64/stdafx.h	(revision 529)
@@ -43,5 +43,4 @@
 #include "../BasicCompiler_Common/BasicFixed.h"
 
-#include <Binary.h>
 #include <NativeCode.h>
 #include <Source.h>
Index: trunk/ab5.0/abdev/compiler_x86/compiler_x86.vcproj
===================================================================
--- trunk/ab5.0/abdev/compiler_x86/compiler_x86.vcproj	(revision 528)
+++ trunk/ab5.0/abdev/compiler_x86/compiler_x86.vcproj	(revision 529)
@@ -1438,16 +1438,4 @@
 				>
 				<File
-					RelativePath="..\BasicCompiler_Common\include\Binary.h"
-					>
-				</File>
-				<File
-					RelativePath="..\BasicCompiler_Common\include\BoostSerializationSupport.h"
-					>
-				</File>
-				<File
-					RelativePath="..\BasicCompiler_Common\include\Hashmap.h"
-					>
-				</File>
-				<File
 					RelativePath="..\BasicCompiler_Common\include\logger.h"
 					>
Index: trunk/ab5.0/abdev/compiler_x86/stdafx.h
===================================================================
--- trunk/ab5.0/abdev/compiler_x86/stdafx.h	(revision 528)
+++ trunk/ab5.0/abdev/compiler_x86/stdafx.h	(revision 529)
@@ -43,5 +43,4 @@
 #include "../BasicCompiler_Common/BasicFixed.h"
 
-#include <Binary.h>
 #include <NativeCode.h>
 #include <Source.h>