Commit3c9d02c

committed

Merge pull request#367 from ruslo/define.warnings

Fix compiler warnings

2 parents90c8964 +ece375e commit3c9d02cCopy full SHA for 3c9d02c

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@`
`8`	`8`	`#include<gtest/gtest.h>`
`9`	`9`
`10`	`10`	`#include<network/logging/logging.hpp>`
`11`		`-#defineNETWORK_ENABLE_LOGGING`
	`11`	`+#ifndef NETWORK_ENABLE_LOGGING`
	`12`	`+#defineNETWORK_ENABLE_LOGGING`
	`13`	`+#endif`
`12`	`14`	`#include<network/detail/debug.hpp>`
`13`	`15`
`14`	`16`	`usingnamespacenetwork::logging;`
`@@ -73,4 +75,4 @@ TEST(logging_log_record, macro_log) {`
`73`	`75`	`NETWORK_MESSAGE("This is a log through the macro.");`
`74`	`76`	`NETWORK_MESSAGE("This is a log through the macro, with a stream! Num="`
`75`	`77`	`<<42 <<" - OK!");`
`76`		`-}`
	`78`	`+}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`The user can force the logging to be enabled by defining NETWORK_ENABLE_LOGGING.`
`17`	`17`	`*/`
`18`		`-#if defined(NETWORK_DEBUG) && defined(NETWORK_ENABLE_LOGGING)`
	`18`	`+#if defined(NETWORK_DEBUG) &&!defined(NETWORK_ENABLE_LOGGING)`
`19`	`19`	`#defineNETWORK_ENABLE_LOGGING`
`20`	`20`	`#endif`
`21`	`21`

Comments

(0)