1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
Index: cpp-macros/Cargo.toml
===================================================================
--- cpp-macros.orig/Cargo.toml
+++ cpp-macros/Cargo.toml
@@ -28,7 +28,7 @@ features = ["docs-only"]
[lib]
proc-macro = true
[dependencies.aho-corasick]
-version = "0.7.15"
+version = "0.7"
[dependencies.byteorder]
version = "1.0"
@@ -36,8 +36,8 @@ version = "1.0"
[dependencies.cpp_common]
version = "=0.5.6"
-[dependencies.if_rust_version]
-version = "1.0"
+#[dependencies.if_rust_version]
+#version = "1.0"
[dependencies.lazy_static]
version = "1.0"
Index: cpp-macros/src/lib.rs
===================================================================
--- cpp-macros.orig/src/lib.rs
+++ cpp-macros/src/lib.rs
@@ -17,7 +17,7 @@ use syn::parse::Parser;
use syn::Ident;
use byteorder::{LittleEndian, ReadBytesExt};
-use if_rust_version::if_rust_version;
+//use if_rust_version::if_rust_version;
use lazy_static::lazy_static;
use quote::{quote, quote_spanned};
use std::fs::File;
@@ -304,17 +304,18 @@ NOTE: They cannot be generated by macro
const _assert_align: [(); #ret_align] = [(); ::core::mem::align_of::<#ret_ty>()];
}
};
- if_rust_version!(>= 1.36 { quote!(
+/* if_rust_version!(>= 1.36 {*/ quote!(
#assert_size
let mut result = ::core::mem::MaybeUninit::<#ret_ty>::uninit();
#extern_name(#(#call_args,)* result.as_mut_ptr());
result.assume_init()
- )} else { quote!(
+ )
+/* )} else { quote!(
#assert_size
let mut result: #ret_ty = ::core::mem::uninitialized();
#extern_name(#(#call_args,)* &mut result);
result
- )})
+ )})*/
};
let input = proc_macro2::TokenStream::from_iter([closure.body].iter().cloned());
@@ -471,15 +472,15 @@ NOTE: They cannot be generated by macro
if size_data[0].has_flag(flags::IS_COPY_CONSTRUCTIBLE) {
if !size_data[0].has_flag(flags::IS_TRIVIALLY_COPYABLE) && !class.derives("Copy") {
- let call_construct = if_rust_version!(>= 1.36 { quote!(
+ let call_construct = /*if_rust_version!(>= 1.36 { */quote!(
let mut result = ::core::mem::MaybeUninit::<Self>::uninit();
#copyctr_name(& *self, result.as_mut_ptr());
result.assume_init()
- )} else { quote!(
+ )/*} else { quote!(
let mut result : Self = ::core::mem::uninitialized();
#copyctr_name(& *self, &mut result);
result
- )});
+ )})*/;
result = quote! { #result
impl ::core::clone::Clone for #class_name {
fn clone(&self) -> Self {
@@ -503,15 +504,15 @@ NOTE: They cannot be generated by macro
}
if size_data[0].has_flag(flags::IS_DEFAULT_CONSTRUCTIBLE) {
- let call_construct = if_rust_version!(>= 1.36 { quote!(
+ let call_construct = /*if_rust_version!(>= 1.36 { */quote!(
let mut result = ::core::mem::MaybeUninit::<Self>::uninit();
#defaultctr_name(result.as_mut_ptr());
result.assume_init()
- )} else { quote!(
+ )/*} else { quote!(
let mut result : Self = ::core::mem::uninitialized();
#defaultctr_name(&mut result);
result
- )});
+ )})*/;
result = quote! { #result
impl ::core::default::Default for #class_name {
fn default() -> Self {
|
