summaryrefslogtreecommitdiff
path: root/LayerManagerUtils
diff options
context:
space:
mode:
authorTimo Lotterbach <timo.lotterbach@bmw-carit.de>2013-01-18 03:45:09 -0800
committerTimo Lotterbach <timo.lotterbach@bmw-carit.de>2013-02-05 05:19:31 -0800
commit2f07eeb0d0c2fac537a76a8910546188bc120550 (patch)
treeb648fc03c1bdb0843bf7525fce36b28d935d9b94 /LayerManagerUtils
parentd21aced196ce73515f58acebccf0883f4658fec3 (diff)
downloadlayer_management-2f07eeb0d0c2fac537a76a8910546188bc120550.tar.gz
Maintenenace: fix several compiler warnings in C code
Due to incorrect handling of C source files, the typical compiler warning settings had not been applied to C code, but instead only to C++ code. After fixing the build system setting, this patch fixed most of the compiler warnings in C code. other fixes: - GLXApplicationExample: fixed compiler warnings - CMake: fixed several compiler warnings - LayerManagerBase: fix compiler warning - LayerManagerUtils: suppress DLT macro related warnings, if DLT is enabled - TextureBinders: fixed compiler warning Signed-off-by: Timo Lotterbach <timo.lotterbach@bmw-carit.de>
Diffstat (limited to 'LayerManagerUtils')
-rw-r--r--LayerManagerUtils/src/Bitmap.cpp4
-rw-r--r--LayerManagerUtils/src/Log.cpp5
2 files changed, 7 insertions, 2 deletions
diff --git a/LayerManagerUtils/src/Bitmap.cpp b/LayerManagerUtils/src/Bitmap.cpp
index 253ba2e..fcc1d5d 100644
--- a/LayerManagerUtils/src/Bitmap.cpp
+++ b/LayerManagerUtils/src/Bitmap.cpp
@@ -74,8 +74,8 @@ void writeBitmap(std::string FileName, char* imagedataRGB, int width, int height
header.color2 = 0;
// make sure parent directory exists
- uint currentPos = 0;
- uint lastPos = FileName.find_first_of("/",currentPos);
+ std::size_t currentPos = 0;
+ std::size_t lastPos = FileName.find_first_of("/",currentPos);
while (lastPos != std::string::npos)
{
std::string directory = FileName.substr(0,lastPos);
diff --git a/LayerManagerUtils/src/Log.cpp b/LayerManagerUtils/src/Log.cpp
index e2997f3..1575559 100644
--- a/LayerManagerUtils/src/Log.cpp
+++ b/LayerManagerUtils/src/Log.cpp
@@ -229,6 +229,11 @@ void Log::unregisterDiagnosticInjectionCallback( unsigned int module_id )
#ifdef WITH_DLT
+
+// DLT macros will fail using -pedantic with
+// warning: ISO C++ forbids braced-groups within expressions
+#pragma GCC diagnostic ignored "-pedantic"
+
void Log::LogToDltDaemon(LogContext logContext, LOG_MODES logMode, const std::string& moduleName, const std::basic_string<char>& output)
{