Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
8a25f01d
A
apollo
项目概览
Pinoxchio
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8a25f01d
编写于
8月 08, 2017
作者:
S
siyangy
提交者:
Jiangtao Hu
8月 08, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
get rid of #define private public
上级
671c71b3
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
19 addition
and
10 deletion
+19
-10
modules/perception/lib/base/BUILD
modules/perception/lib/base/BUILD
+1
-0
modules/perception/lib/base/registerer.h
modules/perception/lib/base/registerer.h
+4
-0
modules/perception/lib/base/registerer_test.cc
modules/perception/lib/base/registerer_test.cc
+0
-1
modules/perception/obstacle/onboard/BUILD
modules/perception/obstacle/onboard/BUILD
+2
-0
modules/perception/obstacle/onboard/hdmap_input.h
modules/perception/obstacle/onboard/hdmap_input.h
+6
-0
modules/perception/obstacle/onboard/hdmap_input_test.cc
modules/perception/obstacle/onboard/hdmap_input_test.cc
+0
-2
modules/perception/obstacle/onboard/lidar_process.h
modules/perception/obstacle/onboard/lidar_process.h
+6
-0
modules/perception/obstacle/onboard/lidar_process_test.cc
modules/perception/obstacle/onboard/lidar_process_test.cc
+0
-6
modules/tools/map_tool/map_xysl.cc
modules/tools/map_tool/map_xysl.cc
+0
-1
未找到文件。
modules/perception/lib/base/BUILD
浏览文件 @
8a25f01d
...
@@ -22,6 +22,7 @@ cc_library(
...
@@ -22,6 +22,7 @@ cc_library(
deps
=
[
deps
=
[
"//modules/common"
,
"//modules/common"
,
"//modules/common:log"
,
"//modules/common:log"
,
"@gtest//:gtest"
,
],
],
)
)
...
...
modules/perception/lib/base/registerer.h
浏览文件 @
8a25f01d
...
@@ -57,6 +57,8 @@
...
@@ -57,6 +57,8 @@
#include <string>
#include <string>
#include <vector>
#include <vector>
#include "gtest/gtest_prod.h"
#include "modules/common/log.h"
#include "modules/common/log.h"
#include "modules/common/macro.h"
#include "modules/common/macro.h"
...
@@ -105,6 +107,8 @@ class Any {
...
@@ -105,6 +107,8 @@ class Any {
};
};
PlaceHolder
*
content_
;
PlaceHolder
*
content_
;
FRIEND_TEST
(
ObjectFactoryTest
,
test_ObjectFactory
);
};
};
class
ObjectFactory
{
class
ObjectFactory
{
...
...
modules/perception/lib/base/registerer_test.cc
浏览文件 @
8a25f01d
...
@@ -16,7 +16,6 @@
...
@@ -16,7 +16,6 @@
#include "gtest/gtest.h"
#include "gtest/gtest.h"
#define private public
#include "modules/perception/lib/base/registerer.h"
#include "modules/perception/lib/base/registerer.h"
namespace
apollo
{
namespace
apollo
{
...
...
modules/perception/obstacle/onboard/BUILD
浏览文件 @
8a25f01d
...
@@ -15,6 +15,7 @@ cc_library(
...
@@ -15,6 +15,7 @@ cc_library(
"//modules/perception/lib/pcl_util"
,
"//modules/perception/lib/pcl_util"
,
"//modules/perception/obstacle/base:perception_obstacle_base"
,
"//modules/perception/obstacle/base:perception_obstacle_base"
,
"@eigen//:eigen"
,
"@eigen//:eigen"
,
"@gtest//:gtest"
,
],
],
)
)
...
@@ -38,6 +39,7 @@ cc_library(
...
@@ -38,6 +39,7 @@ cc_library(
"//modules/perception/obstacle/lidar/segmentation/cnnseg:perception_obstacle_lidar_segmention_cnnseg"
,
"//modules/perception/obstacle/lidar/segmentation/cnnseg:perception_obstacle_lidar_segmention_cnnseg"
,
"//modules/perception/obstacle/lidar/tracker/hm_tracker:perception_obstacle_lidar_tracker_hm_tracker"
,
"//modules/perception/obstacle/lidar/tracker/hm_tracker:perception_obstacle_lidar_tracker_hm_tracker"
,
"@eigen//:eigen"
,
"@eigen//:eigen"
,
"@gtest//:gtest"
,
"@ros//:ros_common"
,
"@ros//:ros_common"
,
],
],
)
)
...
...
modules/perception/obstacle/onboard/hdmap_input.h
浏览文件 @
8a25f01d
...
@@ -18,6 +18,9 @@
...
@@ -18,6 +18,9 @@
#define MODULES_PERCEPTION_ONBOARD_HDMAP_INPUT_H_
#define MODULES_PERCEPTION_ONBOARD_HDMAP_INPUT_H_
#include <mutex>
#include <mutex>
#include "gtest/gtest_prod.h"
#include "modules/common/macro.h"
#include "modules/common/macro.h"
#include "modules/map/hdmap/hdmap.h"
#include "modules/map/hdmap/hdmap.h"
#include "modules/perception/lib/base/singleton.h"
#include "modules/perception/lib/base/singleton.h"
...
@@ -56,6 +59,9 @@ class HDMapInput {
...
@@ -56,6 +59,9 @@ class HDMapInput {
std
::
unique_ptr
<
apollo
::
hdmap
::
HDMap
>
hdmap_
;
std
::
unique_ptr
<
apollo
::
hdmap
::
HDMap
>
hdmap_
;
DISALLOW_COPY_AND_ASSIGN
(
HDMapInput
);
DISALLOW_COPY_AND_ASSIGN
(
HDMapInput
);
FRIEND_TEST
(
HDMapInputTest
,
test_Init
);
FRIEND_TEST
(
HDMapInputTest
,
test_GetROI
);
};
};
typedef
typename
std
::
shared_ptr
<
HDMapInput
>
HDMapInputPtr
;
typedef
typename
std
::
shared_ptr
<
HDMapInput
>
HDMapInputPtr
;
...
...
modules/perception/obstacle/onboard/hdmap_input_test.cc
浏览文件 @
8a25f01d
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
#include "modules/common/log.h"
#include "modules/common/log.h"
#include "modules/perception/common/perception_gflags.h"
#include "modules/perception/common/perception_gflags.h"
#define private public
#include "modules/perception/obstacle/onboard/hdmap_input.h"
#include "modules/perception/obstacle/onboard/hdmap_input.h"
namespace
apollo
{
namespace
apollo
{
...
@@ -36,7 +35,6 @@ class HDMapInputTest : public testing::Test {
...
@@ -36,7 +35,6 @@ class HDMapInputTest : public testing::Test {
ASSERT_TRUE
(
hdmap_input_
!=
NULL
);
ASSERT_TRUE
(
hdmap_input_
!=
NULL
);
}
}
private:
HDMapInput
*
hdmap_input_
;
HDMapInput
*
hdmap_input_
;
};
};
...
...
modules/perception/obstacle/onboard/lidar_process.h
浏览文件 @
8a25f01d
...
@@ -18,6 +18,8 @@
...
@@ -18,6 +18,8 @@
#define MODEULES_PERCEPTION_OBSTACLE_ONBOARD_LIDAR_PROCESS_H_
#define MODEULES_PERCEPTION_OBSTACLE_ONBOARD_LIDAR_PROCESS_H_
#include "Eigen/Core"
#include "Eigen/Core"
#include "gtest/gtest_prod.h"
#include "modules/perception/lib/pcl_util/pcl_types.h"
#include "modules/perception/lib/pcl_util/pcl_types.h"
#include "modules/perception/obstacle/base/object.h"
#include "modules/perception/obstacle/base/object.h"
#include "modules/perception/obstacle/lidar/interface/base_object_builder.h"
#include "modules/perception/obstacle/lidar/interface/base_object_builder.h"
...
@@ -75,6 +77,10 @@ class LidarProcess {
...
@@ -75,6 +77,10 @@ class LidarProcess {
std
::
unique_ptr
<
BaseObjectBuilder
>
object_builder_
;
std
::
unique_ptr
<
BaseObjectBuilder
>
object_builder_
;
std
::
unique_ptr
<
BaseTracker
>
tracker_
;
std
::
unique_ptr
<
BaseTracker
>
tracker_
;
pcl_util
::
PointIndicesPtr
roi_indices_
;
pcl_util
::
PointIndicesPtr
roi_indices_
;
FRIEND_TEST
(
LidarProcessTest
,
test_Init
);
FRIEND_TEST
(
LidarProcessTest
,
test_Process
);
FRIEND_TEST
(
LidarProcessTest
,
test_GeneratePbMsg
);
};
};
}
// namespace perception
}
// namespace perception
...
...
modules/perception/obstacle/onboard/lidar_process_test.cc
浏览文件 @
8a25f01d
...
@@ -21,8 +21,6 @@
...
@@ -21,8 +21,6 @@
#include "modules/perception/common/perception_gflags.h"
#include "modules/perception/common/perception_gflags.h"
#include "modules/perception/lib/pcl_util/pcl_types.h"
#include "modules/perception/lib/pcl_util/pcl_types.h"
#include "modules/perception/obstacle/lidar/dummy/dummy_algorithms.h"
#include "modules/perception/obstacle/lidar/dummy/dummy_algorithms.h"
#define private public
#include "modules/perception/obstacle/onboard/lidar_process.h"
#include "modules/perception/obstacle/onboard/lidar_process.h"
namespace
apollo
{
namespace
apollo
{
...
@@ -38,11 +36,7 @@ class LidarProcessTest : public testing::Test {
...
@@ -38,11 +36,7 @@ class LidarProcessTest : public testing::Test {
protected:
protected:
LidarProcessTest
()
{}
LidarProcessTest
()
{}
virtual
~
LidarProcessTest
()
{}
virtual
~
LidarProcessTest
()
{}
virtual
void
SetUp
()
{
lidar_process_
.
RegistAllAlgorithm
();
}
private:
LidarProcess
lidar_process_
;
LidarProcess
lidar_process_
;
};
};
...
...
modules/tools/map_tool/map_xysl.cc
浏览文件 @
8a25f01d
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
#include <fstream>
#include <fstream>
#include "gflags/gflags.h"
#include "gflags/gflags.h"
#define private public
#include "modules/map/proto/map_geometry.pb.h"
#include "modules/map/proto/map_geometry.pb.h"
#include "modules/common/log.h"
#include "modules/common/log.h"
#include "modules/map/hdmap/hdmap_common.h"
#include "modules/map/hdmap/hdmap_common.h"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录