From 30fbb368262b5ab616fbb8097af5d830e9935c37 Mon Sep 17 00:00:00 2001 From: Intel Date: Tue, 23 Jul 2013 16:53:32 +0300 Subject: [PATCH] Code style --- .gitignore | 2 +- CMakeLists.txt | 2 +- cmake/macros/FindMySQL.cmake | 2 +- src/CMakeLists.txt | 2 +- src/server/CMakeLists.txt | 2 +- src/server/poolserver/Server/Server.h | 4 ++-- src/server/shared/CMakeLists.txt | 4 ---- src/server/shared/Configuration/Config.cpp | 2 +- src/server/shared/Configuration/Config.h | 4 ++-- src/server/shared/Database/CMakeLists.txt | 2 +- src/server/shared/Database/{database.cpp => Database.cpp} | 0 src/server/shared/Database/{database.h => Database.h} | 6 +++--- src/server/shared/Logging/Log.cpp | 2 +- src/server/shared/Stratum/CMakeLists.txt | 2 -- src/server/shared/Stratum/Server.h | 4 ++-- src/server/shared/Stratum/{session.cpp => Session.cpp} | 0 src/server/shared/Stratum/{session.h => Session.h} | 0 src/server/shared/Util.h | 6 +++--- 18 files changed, 20 insertions(+), 26 deletions(-) rename src/server/shared/Database/{database.cpp => Database.cpp} (100%) rename src/server/shared/Database/{database.h => Database.h} (91%) delete mode 100644 src/server/shared/Stratum/CMakeLists.txt rename src/server/shared/Stratum/{session.cpp => Session.cpp} (100%) rename src/server/shared/Stratum/{session.h => Session.h} (100%) diff --git a/.gitignore b/.gitignore index bf03687..2ca8849 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,4 @@ CMakeLists.txt.user *.REMOTE.* *.BACKUP.* *.BASE.* -*.LOCAL.* \ No newline at end of file +*.LOCAL.* diff --git a/CMakeLists.txt b/CMakeLists.txt index 86af6d2..df140d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,4 +40,4 @@ endif() include(cmake/showoptions.cmake) # Add sources -add_subdirectory(src) \ No newline at end of file +add_subdirectory(src) diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake index 55c889e..036b830 100644 --- a/cmake/macros/FindMySQL.cmake +++ b/cmake/macros/FindMySQL.cmake @@ -173,4 +173,4 @@ if( MYSQL_LIBRARY ) mark_as_advanced( MYSQL_FOUND MYSQL_LIBRARY MYSQL_EXTRA_LIBRARIES MYSQL_INCLUDE_DIR ) else( MYSQL_LIBRARY ) message(FATAL_ERROR "Could not find the MySQL libraries! Please install the development libraries and headers") -endif( MYSQL_LIBRARY ) \ No newline at end of file +endif( MYSQL_LIBRARY ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 751074f..29768be 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,4 +3,4 @@ add_subdirectory(server) if(TOOLS) add_subdirectory(tools) -endif(TOOLS) \ No newline at end of file +endif(TOOLS) diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 3e4d933..aa2066a 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -8,4 +8,4 @@ if(STATSSERVER) add_subdirectory(shared) endif() add_subdirectory(statsserver) -endif() \ No newline at end of file +endif() diff --git a/src/server/poolserver/Server/Server.h b/src/server/poolserver/Server/Server.h index 2da48bb..463e4ee 100644 --- a/src/server/poolserver/Server/Server.h +++ b/src/server/poolserver/Server/Server.h @@ -1,5 +1,5 @@ -#ifndef SERVER_H -#define SERVER_H +#ifndef SERVER_H_ +#define SERVER_H_ #include "Stratum/Server.h" diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 8daf97f..0788a96 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -26,7 +26,3 @@ include_directories( add_library(shared STATIC ${sources_Shared} ) - -target_link_libraries(shared - ${ACE_LIBRARY} -) \ No newline at end of file diff --git a/src/server/shared/Configuration/Config.cpp b/src/server/shared/Configuration/Config.cpp index fffb803..cc8cc42 100644 --- a/src/server/shared/Configuration/Config.cpp +++ b/src/server/shared/Configuration/Config.cpp @@ -12,4 +12,4 @@ Config::Config() Config::~Config() { -} \ No newline at end of file +} diff --git a/src/server/shared/Configuration/Config.h b/src/server/shared/Configuration/Config.h index a4c0e73..a2cbc3f 100644 --- a/src/server/shared/Configuration/Config.h +++ b/src/server/shared/Configuration/Config.h @@ -1,5 +1,5 @@ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef CONFIG_H_ +#define CONFIG_H_ #include #include diff --git a/src/server/shared/Database/CMakeLists.txt b/src/server/shared/Database/CMakeLists.txt index d353b8d..3ab3788 100644 --- a/src/server/shared/Database/CMakeLists.txt +++ b/src/server/shared/Database/CMakeLists.txt @@ -12,4 +12,4 @@ if(MYSQL) ${sources_MySQL} ${MYSQL_INCLUDE_DIR} ) -endif() \ No newline at end of file +endif() diff --git a/src/server/shared/Database/database.cpp b/src/server/shared/Database/Database.cpp similarity index 100% rename from src/server/shared/Database/database.cpp rename to src/server/shared/Database/Database.cpp diff --git a/src/server/shared/Database/database.h b/src/server/shared/Database/Database.h similarity index 91% rename from src/server/shared/Database/database.h rename to src/server/shared/Database/Database.h index 3ec4c53..dfd6e4f 100644 --- a/src/server/shared/Database/database.h +++ b/src/server/shared/Database/Database.h @@ -1,5 +1,5 @@ -#ifndef DATABASE_H -#define DATABASE_H +#ifndef DATABASE_H_ +#define DATABASE_H_ class Database; class ResultSet; @@ -30,4 +30,4 @@ public: }; -#endif \ No newline at end of file +#endif diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index fa1ee53..e8a3411 100644 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -113,4 +113,4 @@ void Log::AppendFile(std::string msg) return; logfile << msg << std::endl; -} \ No newline at end of file +} diff --git a/src/server/shared/Stratum/CMakeLists.txt b/src/server/shared/Stratum/CMakeLists.txt deleted file mode 100644 index 0af5306..0000000 --- a/src/server/shared/Stratum/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Add sources -file(GLOB sources_stratum *.cpp *.h) \ No newline at end of file diff --git a/src/server/shared/Stratum/Server.h b/src/server/shared/Stratum/Server.h index 7e62420..5a6c758 100644 --- a/src/server/shared/Stratum/Server.h +++ b/src/server/shared/Stratum/Server.h @@ -1,5 +1,5 @@ -#ifndef STRATUM_SERVER_H -#define STRATUM_SERVER_H +#ifndef STRATUM_SERVER_H_ +#define STRATUM_SERVER_H_ #include #include diff --git a/src/server/shared/Stratum/session.cpp b/src/server/shared/Stratum/Session.cpp similarity index 100% rename from src/server/shared/Stratum/session.cpp rename to src/server/shared/Stratum/Session.cpp diff --git a/src/server/shared/Stratum/session.h b/src/server/shared/Stratum/Session.h similarity index 100% rename from src/server/shared/Stratum/session.h rename to src/server/shared/Stratum/Session.h diff --git a/src/server/shared/Util.h b/src/server/shared/Util.h index 8c76ee1..56317c9 100644 --- a/src/server/shared/Util.h +++ b/src/server/shared/Util.h @@ -1,5 +1,5 @@ -#ifndef UTIL_H -#define UTIL_H +#ifndef UTIL_H_ +#define UTIL_H_ #include #include @@ -24,4 +24,4 @@ namespace Util } } -#endif \ No newline at end of file +#endif