Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cartopy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bartoc
cartopy
Commits
7d607f9b
Commit
7d607f9b
authored
6 years ago
by
Ming-Yuan Yu
Browse files
Options
Downloads
Patches
Plain Diff
fixed compilation for c++14
parent
8ad70720
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
cartopy.cpp
+3
-2
3 additions, 2 deletions
cartopy.cpp
with
4 additions
and
3 deletions
CMakeLists.txt
+
1
−
1
View file @
7d607f9b
cmake_minimum_required
(
VERSION 3.1
)
cmake_minimum_required
(
VERSION 3.1
)
project
(
cartopy
)
project
(
cartopy
)
set
(
CMAKE_CXX_STANDARD 1
7
)
set
(
CMAKE_CXX_STANDARD 1
4
)
find_package
(
pybind11 REQUIRED
)
find_package
(
pybind11 REQUIRED
)
find_package
(
cartographer REQUIRED
)
find_package
(
cartographer REQUIRED
)
pybind11_add_module
(
cartopy cartopy.cpp
)
pybind11_add_module
(
cartopy cartopy.cpp
)
...
...
This diff is collapsed.
Click to expand it.
cartopy.cpp
+
3
−
2
View file @
7d607f9b
...
@@ -7,10 +7,10 @@
...
@@ -7,10 +7,10 @@
#include
<string>
#include
<string>
#include
<type_traits>
#include
<type_traits>
#define PROJECT_NAME "cartopy"
#define PROJECT_NAME "cartopy"
namespace
pybind11
::
detail
{
namespace
pybind11
{
namespace
detail
{
template
<
typename
T
>
template
<
typename
T
>
struct
type_caster
<
struct
type_caster
<
T
,
std
::
enable_if
_t
<
std
::
is_base_of
_v
<
google
::
protobuf
::
Message
,
T
>
>
>
{
T
,
typename
std
::
enable_if
<
std
::
is_base_of
<
google
::
protobuf
::
Message
,
T
>
::
value
>::
type
>
{
PYBIND11_TYPE_CASTER
(
T
,
_
(
"google.protobuf.message.Message"
));
PYBIND11_TYPE_CASTER
(
T
,
_
(
"google.protobuf.message.Message"
));
bool
load
(
handle
src
,
bool
)
{
return
false
;
}
bool
load
(
handle
src
,
bool
)
{
return
false
;
}
static
handle
cast
(
T
src
,
return_value_policy
policy
,
static
handle
cast
(
T
src
,
return_value_policy
policy
,
...
@@ -31,6 +31,7 @@ struct type_caster<
...
@@ -31,6 +31,7 @@ struct type_caster<
}
}
};
};
}
}
// namespace pybind11::detail
}
// namespace pybind11::detail
PYBIND11_MODULE
(
cartopy
,
m
)
{
PYBIND11_MODULE
(
cartopy
,
m
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment