PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor edits, removing use namespace from headers

This commit is contained in:
Paul Sutton 2015-06-02 16:15:04 +01:00
parent d7f7827e82
commit 28c78fe6b2
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/modules/FindVolk.cmake
View File

@ -5,7 +5,7 @@ FIND_PATH(
VOLK_INCLUDE_DIRS VOLK_INCLUDE_DIRS
NAMES volk.h NAMES volk.h
HINTS $ENV{VOLK_DIR}/include/volk HINTS $ENV{VOLK_DIR}/include/volk
${CMAKE_INSTALL_PREFIX}/include/volk ${CMAKE_INSTALL_PREFIX}/include/volk
${PC_VOLK_INCLUDE_DIR} ${PC_VOLK_INCLUDE_DIR}
PATHS /usr/local/include/volk PATHS /usr/local/include/volk
/usr/include/volk /usr/include/volk
@ -15,9 +15,9 @@ FIND_LIBRARY(
VOLK_LIBRARIES VOLK_LIBRARIES
NAMES volk NAMES volk
HINTS $ENV{VOLK_DIR}/lib HINTS $ENV{VOLK_DIR}/lib
${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib64
${PC_VOLK_LIBDIR} ${PC_VOLK_LIBDIR}
PATHS /usr/local/lib PATHS /usr/local/lib
/usr/local/lib64 /usr/local/lib64
/usr/lib /usr/lib

24
srsapps/common/include/srsapps/common/log.h
View File

@ -45,15 +45,13 @@
#define Info(fmt, ...) log_h->info(__FILE__, __LINE__, fmt, ##__VA_ARGS__) #define Info(fmt, ...) log_h->info(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
#define Debug(fmt, ...) log_h->debug(__FILE__, __LINE__, fmt, ##__VA_ARGS__) #define Debug(fmt, ...) log_h->debug(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
using namespace std;
namespace srslte { namespace srslte {
class log class log
{ {
public: public:
log(string service_name_) { service_name = service_name_; tti = 0; level = LOG_LEVEL_NONE; } log(std::string service_name_) { service_name = service_name_; tti = 0; level = LOG_LEVEL_NONE; }
// This function shall be called at the start of every tti for printing tti // This function shall be called at the start of every tti for printing tti
void step(uint32_t tti_) { void step(uint32_t tti_) {
@ -74,23 +72,23 @@ public:
} }
// Pure virtual methods for logging // Pure virtual methods for logging
virtual void error(string message, ...) = 0; virtual void error(std::string message, ...) = 0;
virtual void warning(string message, ...) = 0; virtual void warning(std::string message, ...) = 0;
virtual void info(string message, ...) = 0; virtual void info(std::string message, ...) = 0;
virtual void debug(string message, ...) = 0; virtual void debug(std::string message, ...) = 0;
// Same with line and file info // Same with line and file info
virtual void error(string file, int line, string message, ...) = 0; virtual void error(std::string file, int line, std::string message, ...) = 0;
virtual void warning(string file, int line, string message, ...) = 0; virtual void warning(std::string file, int line, std::string message, ...) = 0;
virtual void info(string file, int line, string message, ...) = 0; virtual void info(std::string file, int line, std::string message, ...) = 0;
virtual void debug(string file, int line, string message, ...) = 0; virtual void debug(std::string file, int line, std::string message, ...) = 0;
protected: protected:
string get_service_name() { return service_name; } std::string get_service_name() { return service_name; }
uint32_t tti; uint32_t tti;
log_level_t level; log_level_t level;
private: private:
string service_name; std::string service_name;
}; };
} }