Consistency in namespace-closing comments

[folly.git] / folly / io / async / EventUtil.h

diff --git a/folly/io/async/EventUtil.h b/folly/io/async/EventUtil.h
index 116cf4c5cf8918776b08d101341b66b7cf00bfc8..2a1e6135e112dd9a35cfd4bc5dac942174d5a398 100644 (file)
--- a/folly/io/async/EventUtil.h
+++ b/folly/io/async/EventUtil.h
@@ -1,29 +1,46 @@
 /*
- * Copyright 2015 Facebook, Inc.
+ * Copyright 2004-present Facebook, Inc.
  *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
+
 #pragma once
 
-#include <event.h>  // libevent
+#include <functional>
+
+#include <folly/portability/Event.h>
 
 namespace folly {
 
+# if LIBEVENT_VERSION_NUMBER <= 0x02010101
+#   define FOLLY_LIBEVENT_COMPAT_PLUCK(name) ev_##name
+# else
+#   define FOLLY_LIBEVENT_COMPAT_PLUCK(name) ev_evcallback.evcb_##name
+# endif
+# define FOLLY_LIBEVENT_DEF_ACCESSORS(name) \
+    inline auto event_ref_##name(struct event* ev) -> \
+      decltype(std::ref(ev->FOLLY_LIBEVENT_COMPAT_PLUCK(name))) \
+      { return std::ref(ev->FOLLY_LIBEVENT_COMPAT_PLUCK(name)); } \
+    inline auto event_ref_##name(struct event const* ev) -> \
+      decltype(std::cref(ev->FOLLY_LIBEVENT_COMPAT_PLUCK(name))) \
+      { return std::cref(ev->FOLLY_LIBEVENT_COMPAT_PLUCK(name)); } \
+    //
+
+FOLLY_LIBEVENT_DEF_ACCESSORS(flags)
+
+# undef FOLLY_LIBEVENT_COMPAT_PLUCK
+# undef FOLLY_LIBEVENT_DEF_ACCESSORS
+
 /**
  * low-level libevent utility functions
  */
@@ -35,8 +52,8 @@ class EventUtil {
       EVLIST_REGISTERED = (EVLIST_INSERTED | EVLIST_ACTIVE |
                            EVLIST_TIMEOUT | EVLIST_SIGNAL)
     };
-    return (ev->ev_flags & EVLIST_REGISTERED);
+    return (event_ref_flags(ev) & EVLIST_REGISTERED);
   }
 };
 
-} // folly
+} // namespace folly