From 0f163b60e7ee83bbe471996603ac888b78e98f7b Mon Sep 17 00:00:00 2001 From: zhangyawei Date: Sun, 1 Feb 2015 14:56:47 +0800 Subject: [PATCH] update --- source/common/cmake_install.cmake | 4 ++-- source/common/dbAsync.h | 2 +- source/common/dbhelper/dbHelper.cpp | 2 +- source/mini-breeze/application.cpp | 2 +- source/mini-breeze/logic/dbManager.cpp | 4 ++-- source/mini-breeze/logic/netManager.cpp | 4 ++-- source/mini-breeze/main.cpp | 2 +- source/stressTest/stressMain.cpp | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/source/common/cmake_install.cmake b/source/common/cmake_install.cmake index 11a504a6..cd2daacf 100644 --- a/source/common/cmake_install.cmake +++ b/source/common/cmake_install.cmake @@ -1,4 +1,4 @@ -# Install script for directory: /root/github/mini-breeze/source/common +# Install script for directory: /root/mini/source/common # Set the install prefix if(NOT DEFINED CMAKE_INSTALL_PREFIX) @@ -33,6 +33,6 @@ if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) endif() if(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") - file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY FILES "/root/github/mini-breeze/source/lib/libcommon.a") + file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY FILES "/root/mini/source/lib/libcommon.a") endif() diff --git a/source/common/dbAsync.h b/source/common/dbAsync.h index 8f526e76..e66a0580 100644 --- a/source/common/dbAsync.h +++ b/source/common/dbAsync.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include namespace zsummer { diff --git a/source/common/dbhelper/dbHelper.cpp b/source/common/dbhelper/dbHelper.cpp index 6f19fe9c..76d19343 100644 --- a/source/common/dbhelper/dbHelper.cpp +++ b/source/common/dbhelper/dbHelper.cpp @@ -17,7 +17,7 @@ */ -#include "dbhelper.h" +#include "dbHelper.h" using namespace zsummer::mysql; using namespace zsummer::log4z; diff --git a/source/mini-breeze/application.cpp b/source/mini-breeze/application.cpp index f73063ea..1f235b92 100644 --- a/source/mini-breeze/application.cpp +++ b/source/mini-breeze/application.cpp @@ -1,6 +1,6 @@ #include "application.h" #include -#include "logic/netmanager.h" +#include "logic/netManager.h" #include using namespace zsummer::log4z; diff --git a/source/mini-breeze/logic/dbManager.cpp b/source/mini-breeze/logic/dbManager.cpp index 396e5017..a14a9fe3 100644 --- a/source/mini-breeze/logic/dbManager.cpp +++ b/source/mini-breeze/logic/dbManager.cpp @@ -1,5 +1,5 @@ -#include "netmanager.h" -#include "dbmanager.h" +#include "netManager.h" +#include "dbManager.h" using namespace zsummer::mysql; DBManager::DBManager() diff --git a/source/mini-breeze/logic/netManager.cpp b/source/mini-breeze/logic/netManager.cpp index e80b82e7..10841d5e 100644 --- a/source/mini-breeze/logic/netManager.cpp +++ b/source/mini-breeze/logic/netManager.cpp @@ -1,5 +1,5 @@ -#include "NetManager.h" -#include "DBManager.h" +#include "netManager.h" +#include "dbManager.h" using namespace zsummer::mysql; NetManager::NetManager() diff --git a/source/mini-breeze/main.cpp b/source/mini-breeze/main.cpp index 927487ce..514b76a3 100644 --- a/source/mini-breeze/main.cpp +++ b/source/mini-breeze/main.cpp @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "Application.h" +#include "application.h" #include #include using namespace zsummer::log4z; diff --git a/source/stressTest/stressMain.cpp b/source/stressTest/stressMain.cpp index 3f17b644..dfcf560d 100644 --- a/source/stressTest/stressMain.cpp +++ b/source/stressTest/stressMain.cpp @@ -18,7 +18,7 @@ //! 测试 -#include +#include #include #include extern "C" @@ -29,7 +29,7 @@ extern "C" } -#include +#include #include "lua/summer.h" using namespace zsummer::log4z;