From 575c1d078dac95eac07ebd0eacb554e32c57bb5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergi=20Hern=C3=A0ndez=20Juan?= <shernand@iri.upc.edu>
Date: Fri, 22 Jul 2011 08:24:57 +0000
Subject: [PATCH] Modified the main CMakeLists.txt to set the compiler flags
for the C++ compiler instead of the C compiler. Solved some compilation
warnings that appeared.
---
CMakeLists.txt | 4 ++--
src/asterx1_gps.cpp | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae4adab..497f535 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,8 +18,8 @@ IF (NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE "DEBUG")
ENDIF (NOT CMAKE_BUILD_TYPE)
-SET(CMAKE_C_FLAGS_DEBUG "-g -Wall -D_REENTRANT")
-SET(CMAKE_C_FLAGS_RELEASE "-O3 -D_REENTRANT")
+SET(CMAKE_CXX_FLAGS_DEBUG "-g -Wall -D_REENTRANT")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -D_REENTRANT")
ADD_SUBDIRECTORY(src)
diff --git a/src/asterx1_gps.cpp b/src/asterx1_gps.cpp
index ed57e58..c970361 100644
--- a/src/asterx1_gps.cpp
+++ b/src/asterx1_gps.cpp
@@ -499,9 +499,8 @@ int CasteRx1::synchronizeHeader(const unsigned char *mark, int msecTimeOut, unsi
{
unsigned char cc;
string readMark, targetMark;
- bool endLoop = false;
int retValue = BASIC_SUCCESS;
- int ii=0;
+ unsigned int ii=0;
//sets targetMark
targetMark.append((const char*)mark,markSize);
@@ -528,7 +527,6 @@ int CasteRx1::synchronizeHeader(const unsigned char *mark, int msecTimeOut, unsi
int CasteRx1::sendCommand(const string & cmnd)
{
int retValue;
- int nn;
unsigned char replyBuffer[200];
string receivedReply, expectedReply;
--
GitLab