Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 003c8e6

Browse files
author
Davide Faconti
committed
Always use nonstd::string_view for binary compatibility (fix issue BehaviorTree#200)
1 parent ee74244 commit 003c8e6

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

include/behaviortree_cpp_v3/utils/string_view.hpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@
2626
#define nssv_STRING_VIEW_NONSTD 1
2727
#define nssv_STRING_VIEW_STD 2
2828

29-
#if !defined( nssv_CONFIG_SELECT_STRING_VIEW )
30-
# define nssv_CONFIG_SELECT_STRING_VIEW ( nssv_HAVE_STD_STRING_VIEW ? nssv_STRING_VIEW_STD : nssv_STRING_VIEW_NONSTD )
31-
#endif
29+
// forced by BehaviorTree.CPP
30+
#define nssv_CONFIG_SELECT_STRING_VIEW nssv_STRING_VIEW_NONSTD
31+
32+
//#if !defined( nssv_CONFIG_SELECT_STRING_VIEW )
33+
//# define nssv_CONFIG_SELECT_STRING_VIEW ( nssv_HAVE_STD_STRING_VIEW ? nssv_STRING_VIEW_STD : nssv_STRING_VIEW_NONSTD )
34+
//#endif
3235

3336
#if defined( nssv_CONFIG_SELECT_STD_STRING_VIEW ) || defined( nssv_CONFIG_SELECT_NONSTD_STRING_VIEW )
3437
# error nssv_CONFIG_SELECT_STD_STRING_VIEW and nssv_CONFIG_SELECT_NONSTD_STRING_VIEW are deprecated and removed, please use nssv_CONFIG_SELECT_STRING_VIEW=nssv_STRING_VIEW_...

0 commit comments

Comments
 (0)