1 files changed, 7 insertions, 9 deletions
diff --git a/include/stc/csmap.h b/include/stc/csmap.h
index be726723..48dc053a 100644
--- a/include/stc/csmap.h
+++ b/include/stc/csmap.h
@@ -99,8 +99,8 @@ STC_API void            _cx_memb(_copy)(_cx_self *self, _cx_self other);
 STC_API _cx_value       _cx_memb(_value_clone)(_cx_value _val);
 #if !defined _i_no_emplace
 STC_API _cx_result      _cx_memb(_emplace)(_cx_self* self, i_keyraw rkey _i_MAP_ONLY(, i_valraw rmapped));
-#endif
-#endif
+#endif // !_i_no_emplace
+#endif // !_i_no_clone
 STC_API _cx_self        _cx_memb(_init)(void);
 STC_API _cx_result      _cx_memb(_insert)(_cx_self* self, i_key key _i_MAP_ONLY(, i_val mapped));
 STC_API void            _cx_memb(_drop)(_cx_self* self);
@@ -168,7 +168,7 @@ _cx_memb(_value_drop)(_cx_value* val) {
     STC_INLINE const _cx_mapped*
     _cx_memb(_at)(const _cx_self* self, i_keyraw rkey)
         { _cx_iter it; return &_cx_memb(_find_it)(self, rkey, &it)->second; }
-#endif
+#endif // !_i_isset
 
 STC_INLINE _cx_iter
 _cx_memb(_find)(const _cx_self* self, i_keyraw rkey) {
@@ -268,7 +268,7 @@ _cx_memb(_insert)(_cx_self* self, i_key key _i_MAP_ONLY(, i_val mapped)) {
     return res;
 }
 
-#if !defined _i_isset
+#ifndef _i_isset
     STC_DEF _cx_result
     _cx_memb(_insert_or_assign)(_cx_self* self, i_key key, i_val mapped) {
         _cx_result res = _cx_memb(_insert_entry_)(self, i_keyto((&key)));
@@ -277,8 +277,7 @@ _cx_memb(_insert)(_cx_self* self, i_key key _i_MAP_ONLY(, i_val mapped)) {
         res.ref->second = mapped; return res;
     }
 
-    #if !defined _i_no_clone
-    #if !defined _i_no_emplace
+    #if !defined _i_no_clone && !defined _i_no_emplace
     STC_DEF _cx_result
     _cx_memb(_emplace_or_assign)(_cx_self* self, i_keyraw rkey, i_valraw rmapped) {
         _cx_result res = _cx_memb(_insert_entry_)(self, rkey);
@@ -286,9 +285,8 @@ _cx_memb(_insert)(_cx_self* self, i_key key _i_MAP_ONLY(, i_val mapped)) {
         else { i_valdrop((&res.ref->second)); }
         res.ref->second = i_valfrom(rmapped); return res;
     }
-    #endif
-    #endif
-#endif
+    #endif // !_i_no_clone && !_i_no_emplace
+#endif // !_i_isset
 
 STC_DEF _cx_value*
 _cx_memb(_find_it)(const _cx_self* self, i_keyraw rkey, _cx_iter* out) {