From b06129f345dce9318df413aaf1e344d366795470 Mon Sep 17 00:00:00 2001 From: marcelb Date: Mon, 25 Mar 2024 20:58:52 +0100 Subject: [PATCH] Edit namespaces --- lib/log.hpp | 2 ++ src/log.cpp | 24 +++++++++++++++--------- test/test.cpp | 2 +- test/test.o | Bin 45856 -> 45944 bytes 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/lib/log.hpp b/lib/log.hpp index 88b98b6..6f55987 100644 --- a/lib/log.hpp +++ b/lib/log.hpp @@ -14,6 +14,7 @@ typedef unsigned int uint; #endif namespace marcelb { +namespace logging { using namespace std; @@ -81,6 +82,7 @@ class log { ~log(); }; +} } #endif \ No newline at end of file diff --git a/src/log.cpp b/src/log.cpp index 624b4c1..7fba7b1 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -1,6 +1,9 @@ #include "../lib/log.hpp" -marcelb::log::log(string _dir, bool _isKeepOpen, bool _printInConsole) { +namespace marcelb { +namespace logging { + +log::log(string _dir, bool _isKeepOpen, bool _printInConsole) { dir = _dir; isKeepOpen = _isKeepOpen; printInConsole = _printInConsole; @@ -21,28 +24,28 @@ marcelb::log::log(string _dir, bool _isKeepOpen, bool _printInConsole) { } -bool marcelb::log::isdir() { +bool log::isdir() { struct stat sb; return stat(dir.c_str(), &sb) == 0; } -bool marcelb::log::open() { +bool log::open() { logfile = ofstream (path, ios_base::app); return logfile.is_open(); } -void marcelb::log::loose() { +void log::loose() { logfile.close(); } -void marcelb::log::setMoment() { +void log::setMoment() { time_t rawtime; time (&rawtime); moment = localtime (&rawtime); } -void marcelb::log::put(string logline) { +void log::put(string logline) { io.lock(); if (printInConsole) { cout << logline << endl; @@ -79,7 +82,7 @@ void marcelb::log::put(string logline) { } -void marcelb::log::setPath() { +void log::setPath() { if (dir[dir.length()-1] != '/') { dir.push_back('/'); } @@ -90,7 +93,7 @@ void marcelb::log::setPath() { path = dir + to_string(moment->tm_year+1900) + '-' + mon.str() + '-' + _day.str() + ".log"; } -void marcelb::log::setPrefix(string &logline) { +void log::setPrefix(string &logline) { stringstream hour, min, sec; hour << setw(2) << setfill('0') << moment->tm_hour; min << setw(2) << setfill('0') << moment->tm_min; @@ -100,7 +103,10 @@ void marcelb::log::setPrefix(string &logline) { logline = _logline; } -marcelb::log::~log() { +log::~log() { loose(); } + +} +} diff --git a/test/test.cpp b/test/test.cpp index f609f90..569f25b 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -3,7 +3,7 @@ #include "../lib/log.hpp" using namespace std; -using namespace marcelb; +using namespace marcelb::logging; log mylog("../example", false); diff --git a/test/test.o b/test/test.o index 5f885335c35fd459e239361e62676fdf4849c8a2..9db9de7bf9367525b4d06e348afb72fe1deacd0a 100755 GIT binary patch delta 2117 zcmZuxYfM~46rQ;YbU|2lVasrVmTs%Xwklp0LZwQ1mS6?Df&_`}vRHy7w9CsT)ubw= z0bvW20~$)JF4#6c64|b(iP3gjA2BgC+Y-}9EZs!WCJ;;$Q%y|t%$>o|4fn@4_kQO) z-#v5Y@$Q`R*PJr+ptAKt-{wk#^;plu1hpk@j|*Iwe9snWT{9Bg>Gv3ZIYeintt*o* zfVYdOL?MI{m7MP<_dL-M>|!(>LXnKN0zI5bzvS=gPpDr{%*2o{};TBwZ?hN8X0cX6bB{d<3{~KAAcm;TU;& z71qFKr5aGg=hIst#Cv7V2GB64UB_{b=S}W zl6)fgaLqUAxI@QL9Y59au8tMpK+Q>T^e}o`f6s&0k*VUSetVy&d9&OjdvMS2he2T! zQ!`>kJzd)byVRXz?yS0HG(z@H7EOA<(#y1YjPh<2m5SUb1&)mn~u4ly}{@R zNA2TytVF>{JSydKnC3iIGG8Ew?<7A1F3i29J3IsdeDBinBF8oH7EznOO2`vsmWF(S zzI(dy%|g;hf!uLsd4i6Et&gc!WPa4sA~9Y@7r@cSG&}Z`cW3o35%oy-I^_8o4?oLI z;Ok?w1uXqcotEnne!_wfLgzW@eA6K;=cRKZPJnme6S+UvUBS z=K>V=Gr9_bi0gFR&QX2YD%{%3h3=r-E0=k++_qY{eN-)?JHmwjQjSOhpE@`aPivr$Qi#Tqv>Ef%4i-(OC1xM z3Av*#g6n8Hy`d}aaEvr2<1MP+b@xNz0HfP>w{$yMye4`v)6X*}*Yt%58BsH8t;Vvg25s1&-lV zm>N&<&kRjd$Q~|&R7iu-xUAuKOz@;>qyG}bP`G(2I&pbkNml6r;;e&1-YtH^sE6_d zxc24*%$_n@mkV>6JN7oWmmYvcQvuX^P5y7*sxhd}y2{*ruJ#uiTN;*&i?yX{l!gXK z8Nar6B~@-mW9Kec=ZoBQyv7_ZfxtwPzwE@r%BGcnlI?D7+|R3bR#y}|ODjv9P8hQ0 z`9FWVNCA^~cXGHP?^B6}e{1sYNLwkG)8ck_G@>9By9H*vzk+Ej1OAz?LjGx^acO=q zJX{9xlOL>TZ*P66b7|@jinsc|pG;B`s@yFdrOgFpPn8!H*Va1ik7UDVF>Aql`lSDv aGgm15cp}U1e%}#I|AoNWT*SZ6X8Z?K^V6dM delta 1978 zcmZuxYfM~46uz?$UWH{BmK|=PDHLh7jpF4IUP55YhBON8Qu?FDmM*di3f(RcqG^Nz zHB?yWwx_kJt&s&R+Eml^YWqWfNLuBG+LYSZ`iPZ88Z{)MNfjG4o_Q<*;{5pTx!-rr znK?6OX7R3J^sXWJpy7w};mx&1yTAImbjP&g{@|jmC8O@0+JA0#SL*@ekKN=J`1^9m z9EAF)x=0j-D5~=Dkg{SBnCYX0!mOE+W+44Jfkf zhSC>JPzUu z=KbC+#Chp+p7}iVvsCZNleS2;7)xVOdu7xiaF47vcO#p`ddz$(Vy(NxEcCoxDMEM4 z3^yVkBmqK0RC~%UGG35p{CH#?$g>(&zb2Ph6#0gs`bdh1^~$?lAY=XD3D9*{rMk3M zsm5a4iq$?4u^EU@|?1yS^_g8l=L%v@91fwhk^?vwzja% z)Bd!#wGoELt08N`311#h-x4A7T7AzJc6d8?csiS1T}s1~OYTg`_Z{%=2b;YZ$}D;M zE{G%g!4sEB((>qnmX4;DcJAbTH3WOkt$}|nn%;P-$q4k!ZLpoKgKtm9>cO)c4RHKjf&(#k2TG*=hw4mH5dkQ3(OH^H8^l(yBUtGl=aS*zcw98AWvk`_za`J;YHWn)$qy~d jb5`Z*A5DI}s;*X_ufvOV73tG&yJN{DsCpryTi^5_`5BtC