原来的Egametang目录改成Platform目录,Platform目录和Game统一在

Egametang目录之下

Src/CMakeLists.txt → Egametang/CMakeLists.txt

@@ -13,8 +13,8 @@ IF(BUILD_TESTS)
 	ENABLE_TESTING()
 ENDIF()
 
-INCLUDE_DIRECTORIES(Egametang)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/Egametang)
+INCLUDE_DIRECTORIES(Platform)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/Platform)
 
 FIND_PACKAGE(GFlags REQUIRED)
 INCLUDE_DIRECTORIES(${GFLAGS_INCLUDE_DIR})
@@ -53,5 +53,5 @@ set(ThirdPartyLibs
 	${PERFTOOLS_DEBUG_LIBRARIES}
 )
 
-ADD_SUBDIRECTORY(Egametang)
+ADD_SUBDIRECTORY(Platform)
 ADD_SUBDIRECTORY(Game)

Src/Game/Event/BuffTypeCondition.cc → Egametang/Game/Event/BuffTypeCondition.cc

@@ -1,8 +1,7 @@
-#include <boost/foreach.hpp>
-#include "Base/Marcos.h"
 #include "Event/BuffTypeCondition.h"
 
-namespace Egametang {
+namespace Egametang {
+
 BuffType::BuffType(int buff_type): buff_type(buff_type)
 {
 }
@@ -12,7 +11,7 @@ bool BuffType::Check(ContexIf* contex)
 	return true;
 }
 
-Egametang::BuffTypeFactory::~BuffTypeFactory()
+BuffTypeFactory::~BuffTypeFactory()
 {
 }
 

Src/Egametang/Python/PythonInterpreterTest.cc → Egametang/Platform/Python/PythonInterpreterTest.cc

@@ -68,7 +68,7 @@ BOOST_PYTHON_MODULE(PersonTest)
 TEST_F(PythonInterpreterTest, EnterPythonScript)
 {
 	initPersonTest();
-	interpreter.ImportPath("../../../Src/Egametang/Python/");
+	interpreter.ImportPath("../../../Egametang/Platform/Python/");
 	interpreter.ImportModule("PythonInterpreterTest");
 
 	PersonTestPtr person(new PersonTest);

Src/Experimental/BoostAsioTest.cc

@@ -1,67 +0,0 @@
-#include <iostream>
-#include <boost/asio.hpp>
-#include <boost/thread.hpp>
-#include <boost/bind.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-
-class printer
-{
-public:
-	printer(boost::asio::io_service& io) :
-		strand_(io), timer1_(io, boost::posix_time::seconds(1)), timer2_(io,
-				boost::posix_time::seconds(1)), count_(0)
-	{
-		timer1_.async_wait(strand_.wrap(boost::bind(&printer::print1, this)));
-		timer2_.async_wait(strand_.wrap(boost::bind(&printer::print2, this)));
-	}
-
-	~printer()
-	{
-		std::cout << "Final count is " << count_ << "\n";
-	}
-
-	void print1()
-	{
-		if (count_ < 10)
-		{
-			std::cout << "Timer 1: " << count_ << "\n";
-			++count_;
-
-			timer1_.expires_at(timer1_.expires_at()
-					+ boost::posix_time::seconds(1));
-			timer1_.async_wait(
-					strand_.wrap(boost::bind(&printer::print1, this)));
-		}
-	}
-
-	void print2()
-	{
-		if (count_ < 10)
-		{
-			std::cout << "Timer 2: " << count_ << "\n";
-			++count_;
-
-			timer2_.expires_at(timer2_.expires_at()
-					+ boost::posix_time::seconds(1));
-			timer2_.async_wait(
-					strand_.wrap(boost::bind(&printer::print2, this)));
-		}
-	}
-
-private:
-	boost::asio::strand strand_;
-	boost::asio::deadline_timer timer1_;
-	boost::asio::deadline_timer timer2_;
-	int count_;
-};
-
-int main()
-{
-	boost::asio::io_service io;
-	printer p(io);
-	boost::thread t(boost::bind(&boost::asio::io_service::run, &io));
-	io.run();
-	t.join();
-
-	return 0;
-}

Src/Experimental/BoostFunctionTest.cc

@@ -1,53 +0,0 @@
-//  Created on: 2010-6-28
-//      Author: tanghai
-
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
-#include <gtest/gtest.h>
-#include <gflags/gflags.h>
-#include <glog/logging.h>
-
-namespace Egametang {
-class BoostTest: public testing::Test
-{
-protected:
-	int a;
-	boost::function<int(int)> func;
-
-	void SetUp()
-	{
-		a = 6;
-	}
-public:
-	BoostTest()
-	{
-	}
-
-	virtual ~BoostTest()
-	{
-	}
-
-	int Max(int a, int b)
-	{
-		LOG(INFO) << a << " " << b;
-		return a > b? a : b;
-	}
-};
-
-TEST_F(BoostTest, Test1)
-{
-	int x = 5;
-	func = boost::bind(&BoostTest::Max, this, _1, x);
-	int b = func(a);
-	LOG(INFO) << b;
-}
-}
-
-int main(int argc, char* argv[])
-{
-	FLAGS_logtostderr = true;
-	testing::InitGoogleTest(&argc, argv);
-	google::ParseCommandLineFlags(&argc, &argv, true);
-	google::InitGoogleLogging(argv[0]);
-	return RUN_ALL_TESTS();
-}