Skip to content

Commit b6148c1

Browse files
authored
use fully qualified names to avoid conflicts in wrappers (#440)
when wrapper includes both core and public API classes, some names might be sensitive to the order of the headers. In order to workaround this problem, use fully qualified names for the classes in the public headers
1 parent a1d5649 commit b6148c1

12 files changed

+26
-25
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
/cmake-build-report.tar.gz
55
/.idea/workspace.xml
66
/.idea/sonarlint
7+
/.cache
78
/.vs
89
/.vscode
910
/CMakeSettings.json

couchbase/get_and_lock_options.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ initiate_get_and_lock_operation(std::shared_ptr<couchbase::core::cluster> core,
8686
std::string collection_name,
8787
std::string document_key,
8888
std::chrono::seconds lock_duration,
89-
get_and_lock_options::built options,
90-
get_and_lock_handler&& handler);
89+
couchbase::get_and_lock_options::built options,
90+
couchbase::get_and_lock_handler&& handler);
9191
#endif
9292
} // namespace impl
9393
} // namespace core

couchbase/get_and_touch_options.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ initiate_get_and_touch_operation(std::shared_ptr<couchbase::core::cluster> core,
8686
std::string collection_name,
8787
std::string document_key,
8888
std::uint32_t expiry,
89-
get_and_touch_options::built options,
90-
get_and_touch_handler&& handler);
89+
couchbase::get_and_touch_options::built options,
90+
couchbase::get_and_touch_handler&& handler);
9191
#endif
9292
} // namespace impl
9393
} // namespace core

couchbase/get_options.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ initiate_get_operation(std::shared_ptr<couchbase::core::cluster> core,
129129
std::string scope_name,
130130
std::string collection_name,
131131
std::string document_key,
132-
get_options::built options,
133-
get_handler&& handler);
132+
couchbase::get_options::built options,
133+
couchbase::get_handler&& handler);
134134
#endif
135135
} // namespace impl
136136
} // namespace core

couchbase/insert_options.hxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ initiate_insert_operation(std::shared_ptr<couchbase::core::cluster> core,
127127
std::string scope_name,
128128
std::string collection_name,
129129
std::string document_key,
130-
codec::encoded_value encoded,
131-
insert_options::built options,
132-
insert_handler&& handler);
130+
couchbase::codec::encoded_value encoded,
131+
couchbase::insert_options::built options,
132+
couchbase::insert_handler&& handler);
133133
#endif
134134
} // namespace impl
135135
} // namespace core

couchbase/lookup_in_options.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ initiate_lookup_in_operation(std::shared_ptr<couchbase::core::cluster> core,
111111
std::string collection_name,
112112
std::string document_key,
113113
const std::vector<couchbase::core::impl::subdoc::command>& specs,
114-
lookup_in_options::built options,
115-
lookup_in_handler&& handler);
114+
couchbase::lookup_in_options::built options,
115+
couchbase::lookup_in_handler&& handler);
116116
#endif
117117
} // namespace impl
118118
} // namespace core

couchbase/mutate_in_options.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ initiate_mutate_in_operation(std::shared_ptr<couchbase::core::cluster> core,
225225
std::string collection_name,
226226
std::string document_key,
227227
const std::vector<couchbase::core::impl::subdoc::command>& specs,
228-
mutate_in_options::built options,
229-
mutate_in_handler&& handler);
228+
couchbase::mutate_in_options::built options,
229+
couchbase::mutate_in_handler&& handler);
230230
#endif
231231
} // namespace impl
232232
} // namespace core

couchbase/remove_options.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ initiate_remove_operation(std::shared_ptr<couchbase::core::cluster> core,
115115
std::string scope_name,
116116
std::string collection_name,
117117
std::string document_key,
118-
remove_options::built options,
119-
remove_handler&& handler);
118+
couchbase::remove_options::built options,
119+
couchbase::remove_handler&& handler);
120120
#endif
121121
} // namespace impl
122122
} // namespace core

couchbase/replace_options.hxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ initiate_replace_operation(std::shared_ptr<couchbase::core::cluster> core,
175175
std::string scope_name,
176176
std::string collection_name,
177177
std::string document_key,
178-
codec::encoded_value encoded,
179-
replace_options::built options,
180-
replace_handler&& handler);
178+
couchbase::codec::encoded_value encoded,
179+
couchbase::replace_options::built options,
180+
couchbase::replace_handler&& handler);
181181
#endif
182182
} // namespace impl
183183
} // namespace core

couchbase/touch_options.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ initiate_touch_operation(std::shared_ptr<couchbase::core::cluster> core,
8686
std::string collection_name,
8787
std::string document_key,
8888
std::uint32_t expiry,
89-
touch_options::built options,
90-
touch_handler&& handler);
89+
couchbase::touch_options::built options,
90+
couchbase::touch_handler&& handler);
9191
#endif
9292
} // namespace impl
9393
} // namespace core

couchbase/unlock_options.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ initiate_unlock_operation(std::shared_ptr<couchbase::core::cluster> core,
8989
std::string collection_name,
9090
std::string document_key,
9191
couchbase::cas cas,
92-
unlock_options::built options,
93-
unlock_handler&& handler);
92+
couchbase::unlock_options::built options,
93+
couchbase::unlock_handler&& handler);
9494
#endif
9595
} // namespace impl
9696
} // namespace core

couchbase/upsert_options.hxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ initiate_upsert_operation(std::shared_ptr<couchbase::core::cluster> core,
149149
std::string scope_name,
150150
std::string collection_name,
151151
std::string document_key,
152-
codec::encoded_value encoded,
153-
upsert_options::built options,
154-
upsert_handler&& handler);
152+
couchbase::codec::encoded_value encoded,
153+
couchbase::upsert_options::built options,
154+
couchbase::upsert_handler&& handler);
155155
#endif
156156
} // namespace impl
157157
} // namespace core

0 commit comments

Comments
 (0)