Skip to content

Fixed names conflict with dldt#14914

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
Nuzhny007:3.4
Jun 27, 2019
Merged

Fixed names conflict with dldt#14914
opencv-pushbot merged 1 commit intoopencv:3.4from
Nuzhny007:3.4

Conversation

@Nuzhny007
Copy link
Copy Markdown
Contributor

@Nuzhny007 Nuzhny007 commented Jun 27, 2019 •
edited by alalek
Loading

resolves #14912

Fixed compilation names conflict cv::Ptr in opencv/dnn and ICNNNetwork::Ptr in dldt.
Was added cv:: namespace to the Ptr

force_builders=Custom,Custom Win,Custom Mac
build_image:Custom=ubuntu-openvino-2019r1:16.04
build_image:Custom Win=openvino-2019r1
build_image:Custom Mac=openvino-2019r1

test_modules:Custom=dnn,python2,python3,java
test_modules:Custom Win=dnn,python2,python3,java
test_modules:Custom Mac=dnn,python2,python3,java

buildworker:Custom=linux-1
test_opencl:Custom=ON
test_bigdata:Custom=1
test_filter:Custom=*

dkurt
dkurt approved these changes Jun 27, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@dkurt dkurt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@opencv-pushbot opencv-pushbot merged commit 031e57b into opencv:3.4 Jun 27, 2019
opencv-pushbot pushed a commit that referenced this pull request Jun 27, 2019
@alalek
Merge pull request #14914 from Nuzhny007:3.4
c531e27
@alalek alalek mentioned this pull request Jun 29, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dkurt dkurt dkurt approved these changes

Assignees

@dkurt dkurt

Labels

category: build/install category: dnn

Projects

None yet

Milestone

3.4.7

Development

Successfully merging this pull request may close these issues.

4 participants

@Nuzhny007 @dkurt @opencv-pushbot @alalek