Code style

.gitignore

@@ -14,4 +14,4 @@ CMakeLists.txt.user
 *.REMOTE.*
 *.BACKUP.*
 *.BASE.*
-*.LOCAL.*
+*.LOCAL.*

CMakeLists.txt

@@ -40,4 +40,4 @@ endif()
 include(cmake/showoptions.cmake)
 
 # Add sources
-add_subdirectory(src)
+add_subdirectory(src)

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 )
+endif( MYSQL_LIBRARY )

src/CMakeLists.txt

@@ -3,4 +3,4 @@ add_subdirectory(server)
 
 if(TOOLS)
   add_subdirectory(tools)
-endif(TOOLS)
+endif(TOOLS)

src/server/CMakeLists.txt

@@ -8,4 +8,4 @@ if(STATSSERVER)
     add_subdirectory(shared)
   endif()
   add_subdirectory(statsserver)
-endif()
+endif()

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"
 

src/server/shared/CMakeLists.txt

@@ -26,7 +26,3 @@ include_directories(
 add_library(shared STATIC
   ${sources_Shared}
 )
-
-target_link_libraries(shared
-  ${ACE_LIBRARY}
-)

src/server/shared/Configuration/Config.cpp

@@ -12,4 +12,4 @@ Config::Config()
 
 Config::~Config()
 {
-}
+}

src/server/shared/Configuration/Config.h

@@ -1,5 +1,5 @@
-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef CONFIG_H_
+#define CONFIG_H_
 
 #include <cassert>
 #include <cstring>

src/server/shared/Database/CMakeLists.txt

@@ -12,4 +12,4 @@ if(MYSQL)
     ${sources_MySQL}
     ${MYSQL_INCLUDE_DIR}
   )
-endif()
+endif()

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
+#endif

src/server/shared/Logging/Log.cpp

@@ -113,4 +113,4 @@ void Log::AppendFile(std::string msg)
 		return;
 	
 	logfile << msg << std::endl;
-}
+}

src/server/shared/Stratum/CMakeLists.txt

@@ -1,2 +0,0 @@
-# Add sources
-file(GLOB sources_stratum *.cpp *.h)

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 <boost/cstdint.hpp>
 #include <string>

src/server/shared/Util.h

@@ -1,5 +1,5 @@
-#ifndef UTIL_H
-#define UTIL_H
+#ifndef UTIL_H_
+#define UTIL_H_
 
 #include <sstream>
 #include <iostream>
@@ -24,4 +24,4 @@ namespace Util
 	}
 }
 
-#endif
+#endif