fix(*): fix 18.04 complie warning.

This commit is contained in:
TinyO 2019-10-17 13:48:37 +08:00
parent 427c473fc8
commit 9e8c759f0d
3 changed files with 19 additions and 2 deletions

View File

@ -151,7 +151,7 @@ endif()
## libmynteye ## libmynteye
if(NOT WITH_GLOG AND NOT OS_WIN) if(NOT WITH_GLOG AND NOT OS_WIN)
set(__MINIGLOG_FLAGS "-Wno-unused-parameter -Wno-format -Wno-return-type") set(__MINIGLOG_FLAGS "-Wno-unused-parameter -Wno-format -Wno-return-type -Wno-comment")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${__MINIGLOG_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${__MINIGLOG_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${__MINIGLOG_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${__MINIGLOG_FLAGS}")
unset(__MINIGLOG_FLAGS) unset(__MINIGLOG_FLAGS)

View File

@ -15,6 +15,11 @@
#define MYNTEYE_DEVICE_DEVICE_H_ #define MYNTEYE_DEVICE_DEVICE_H_
#pragma once #pragma once
#include <sys/types.h>
// undef major & minor for 18.04 gcc
#undef major
#undef minor
#include <map> #include <map>
#include <memory> #include <memory>
#include <mutex> #include <mutex>

View File

@ -1,4 +1,16 @@
#include <stdio.h> // Copyright 2018 Slightech Co., Ltd. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
#include "mynteye/api/api.h" #include "mynteye/api/api.h"