reset obdpid

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 183170b..30c0ba3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ pkg_check_modules(glib REQUIRED glib-2.0 gobject-2.0)
 pkg_check_modules(json REQUIRED json)
 
 
-add_definitions(-std=c++11)
+add_definitions(-std=c++0x)
 add_definitions(-DDBusServiceName="org.automotive.message.broker")
 
 set(include_dirs ${libtool_INCLUDE_DIR} ${glib_INCLUDE_DIRS} ${gio_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${json_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/lib)

diff --git a/plugins/obd2plugin/obdpid.h b/plugins/obd2plugin/obdpid.h
index bfc9dc9..da59e49 100644 (file)
--- a/plugins/obd2plugin/obdpid.h
+++ b/plugins/obd2plugin/obdpid.h
@@ -227,17 +227,7 @@ public:
        }
        bool isValid(ByteArray replyVector)
        {
-<<<<<<< HEAD
-               if(!MassAirFlowPid::tryParse(replyVector))
-               {
-                       isValidVal = false;
-                       return false;
-               }
-               isValidVal = true;
-               return true;
-=======
                return isValidVal = MassAirFlowPid::isValid(replyVector);
->>>>>>> 46f67f8d33d8eccc26d9326ce1c6b9745dc6bb97
        }
        void parse(ByteArray replyVector)
        {