1. 修订ifndef-guard，不再使用保留字

2. 移除过老编译器的支持，统一加#pragma once
fcccode · Oct 30, 2017 · 029123a · 029123a
1 parent fc6b955
commit 029123a
Show file tree

Hide file tree

Showing 43 changed files with 258 additions and 284 deletions.
diff --git a/include/libcopp/coroutine/coroutine_context.h b/include/libcopp/coroutine/coroutine_context.h
@@ -1,5 +1,5 @@
-#ifndef _COPP_COROUTINE_CONTEXT_COROUTINE_CONTEXT_BASE_H_
-#define _COPP_COROUTINE_CONTEXT_COROUTINE_CONTEXT_BASE_H_
+#ifndef COPP_COROUTINE_CONTEXT_COROUTINE_CONTEXT_BASE_H
+#define COPP_COROUTINE_CONTEXT_COROUTINE_CONTEXT_BASE_H
 
 #pragma once
 

diff --git a/include/libcopp/coroutine/coroutine_context_container.h b/include/libcopp/coroutine/coroutine_context_container.h
@@ -1,13 +1,11 @@
 /**
  * coroutine context container
  */
-#ifndef _COPP_COROUTINE_CONTEXT_COROUTINE_CONTEXT_CONTAINER_H_
-#define _COPP_COROUTINE_CONTEXT_COROUTINE_CONTEXT_CONTAINER_H_
+#ifndef COPP_COROUTINE_CONTEXT_COROUTINE_CONTEXT_CONTAINER_H
+#define COPP_COROUTINE_CONTEXT_COROUTINE_CONTEXT_CONTAINER_H
 
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 #pragma once
-#endif
 
 #include <cstddef>
 

diff --git a/include/libcopp/stack/allocator/stack_allocator_malloc.h b/include/libcopp/stack/allocator/stack_allocator_malloc.h
@@ -1,5 +1,5 @@
-#ifndef _COPP_STACKCONTEXT_ALLOCATOR_MALLOC_H_
-#define _COPP_STACKCONTEXT_ALLOCATOR_MALLOC_H_
+#ifndef COPP_STACKCONTEXT_ALLOCATOR_MALLOC_H
+#define COPP_STACKCONTEXT_ALLOCATOR_MALLOC_H
 
 #pragma once
 

diff --git a/include/libcopp/stack/allocator/stack_allocator_memory.h b/include/libcopp/stack/allocator/stack_allocator_memory.h
@@ -1,5 +1,5 @@
-#ifndef _COPP_STACKCONTEXT_ALLOCATOR_MEMORY_H_
-#define _COPP_STACKCONTEXT_ALLOCATOR_MEMORY_H_
+#ifndef COPP_STACKCONTEXT_ALLOCATOR_MEMORY_H
+#define COPP_STACKCONTEXT_ALLOCATOR_MEMORY_H
 
 #pragma once
 

diff --git a/include/libcopp/stack/allocator/stack_allocator_pool.h b/include/libcopp/stack/allocator/stack_allocator_pool.h
@@ -1,5 +1,5 @@
-#ifndef _COPP_STACKCONTEXT_ALLOCATOR_POOL_H_
-#define _COPP_STACKCONTEXT_ALLOCATOR_POOL_H_
+#ifndef COPP_STACKCONTEXT_ALLOCATOR_POOL_H
+#define COPP_STACKCONTEXT_ALLOCATOR_POOL_H
 
 #pragma once
 

diff --git a/include/libcopp/stack/allocator/stack_allocator_posix.h b/include/libcopp/stack/allocator/stack_allocator_posix.h
@@ -1,5 +1,5 @@
-#ifndef _COPP_STACKCONTEXT_ALLOCATOR_POSIX_H_
-#define _COPP_STACKCONTEXT_ALLOCATOR_POSIX_H_
+#ifndef COPP_STACKCONTEXT_ALLOCATOR_POSIX_H
+#define COPP_STACKCONTEXT_ALLOCATOR_POSIX_H
 
 #pragma once
 

diff --git a/include/libcopp/stack/allocator/stack_allocator_split_segment.h b/include/libcopp/stack/allocator/stack_allocator_split_segment.h
@@ -1,5 +1,5 @@
-#ifndef _COPP_STACKCONTEXT_ALLOCATOR_SPLIT_SEGMENT_H_
-#define _COPP_STACKCONTEXT_ALLOCATOR_SPLIT_SEGMENT_H_
+#ifndef COPP_STACKCONTEXT_ALLOCATOR_SPLIT_SEGMENT_H
+#define COPP_STACKCONTEXT_ALLOCATOR_SPLIT_SEGMENT_H
 
 #pragma once
 

diff --git a/include/libcopp/stack/allocator/stack_allocator_windows.h b/include/libcopp/stack/allocator/stack_allocator_windows.h
@@ -1,5 +1,5 @@
-#ifndef _COPP_STACKCONTEXT_ALLOCATOR_WINDOWS_H_
-#define _COPP_STACKCONTEXT_ALLOCATOR_WINDOWS_H_
+#ifndef COPP_STACKCONTEXT_ALLOCATOR_WINDOWS_H
+#define COPP_STACKCONTEXT_ALLOCATOR_WINDOWS_H
 
 #pragma once
 

diff --git a/include/libcopp/stack/stack_allocator.h b/include/libcopp/stack/stack_allocator.h
@@ -1,7 +1,9 @@
-#ifndef _COPP_STACKCONTEXT_STACK_ALLOCATOR_H_
-#define _COPP_STACKCONTEXT_STACK_ALLOCATOR_H_
+#ifndef COPP_STACKCONTEXT_STACK_ALLOCATOR_H
+#define COPP_STACKCONTEXT_STACK_ALLOCATOR_H
 
 
+#pragma once
+
 #include <libcopp/utils/features.h>
 
 #include "allocator/stack_allocator_malloc.h"

diff --git a/include/libcopp/stack/stack_context.h b/include/libcopp/stack/stack_context.h
@@ -1,10 +1,8 @@
-#ifndef _COPP_STACKCONTEXT_STACKCONTEXT_H_
-#define _COPP_STACKCONTEXT_STACKCONTEXT_H_
+#ifndef COPP_STACKCONTEXT_STACKCONTEXT_H
+#define COPP_STACKCONTEXT_STACKCONTEXT_H
 
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
-#endif
 
 #include <cstddef>
 

diff --git a/include/libcopp/stack/stack_pool.h b/include/libcopp/stack/stack_pool.h
@@ -1,5 +1,5 @@
-#ifndef _COPP_STACKCONTEXT_STACK_POOL_H_
-#define _COPP_STACKCONTEXT_STACK_POOL_H_
+#ifndef COPP_STACKCONTEXT_STACK_POOL_H
+#define COPP_STACKCONTEXT_STACK_POOL_H
 
 #pragma once
 

diff --git a/include/libcopp/stack/stack_traits.h b/include/libcopp/stack/stack_traits.h
@@ -1,9 +1,7 @@
 #ifndef _COPP_STACKCONTEXT_STACK_TRAITS_H
 #define _COPP_STACKCONTEXT_STACK_TRAITS_H
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
-#endif
 
 #include <cstddef>
 #include <libcopp/utils/features.h>

diff --git a/include/libcopp/utils/atomic_int_type.h b/include/libcopp/utils/atomic_int_type.h
@@ -15,8 +15,8 @@
  *     2016-06-14
  */
 
-#ifndef _UTIL_LOCK_ATOMIC_INT_TYPE_H_
-#define _UTIL_LOCK_ATOMIC_INT_TYPE_H_
+#ifndef UTIL_LOCK_ATOMIC_INT_TYPE_H
+#define UTIL_LOCK_ATOMIC_INT_TYPE_H
 
 #pragma once
 

diff --git a/include/libcopp/utils/atomic_int_type_msvc_impl.h b/include/libcopp/utils/atomic_int_type_msvc_impl.h
@@ -13,8 +13,8 @@
  * @history
  *     2016-06-14
  */
-#ifndef _UTIL_LOCK_ATOMIC_INT_TYPE_MSVC_IMPL_H_
-#define _UTIL_LOCK_ATOMIC_INT_TYPE_MSVC_IMPL_H_
+#ifndef UTIL_LOCK_ATOMIC_INT_TYPE_MSVC_IMPL_H
+#define UTIL_LOCK_ATOMIC_INT_TYPE_MSVC_IMPL_H
 
 #pragma once
 

diff --git a/include/libcopp/utils/config/compiler_features.h b/include/libcopp/utils/config/compiler_features.h
@@ -647,6 +647,8 @@
 #  else
 #    define UTIL_CONFIG_STATIC_ASSERT_JOIN(X, Y) UTIL_CONFIG_STATIC_ASSERT_JOIN_IMPL(X, Y)
 #    define UTIL_CONFIG_STATIC_ASSERT_JOIN_IMPL(X, Y) X##Y
+#pragma once
+
 template<bool> struct UTIL_CONFIGStaticAssert;
 template<> struct UTIL_CONFIGStaticAssert<true>{};
 #    define UTIL_CONFIG_STATIC_ASSERT(X) enum { UTIL_CONFIG_STATIC_ASSERT_JOIN(UTIL_CONFIGStaticAssertEnum, __LINE__) = sizeof(UTIL_CONFIGStaticAssert<X>) }

diff --git a/include/libcopp/utils/errno.h b/include/libcopp/utils/errno.h
@@ -1,10 +1,8 @@
-#ifndef _COPP_UTILS_ERRNO_H_
-#define _COPP_UTILS_ERRNO_H_
+#ifndef COPP_UTILS_ERRNO_H
+#define COPP_UTILS_ERRNO_H
 
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 #pragma once
-#endif
 
 namespace copp {
     /**

diff --git a/include/libcopp/utils/features.h b/include/libcopp/utils/features.h
@@ -1,12 +1,10 @@
 // cmake template file
 
-#ifndef _COPP_UTILS_FEATURES_H_
-#define _COPP_UTILS_FEATURES_H_
+#ifndef COPP_UTILS_FEATURES_H
+#define COPP_UTILS_FEATURES_H
 
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 #pragma once
-#endif
 
 #include <libcopp/utils/config/compiler_features.h>
 

diff --git a/include/libcopp/utils/lock_holder.h b/include/libcopp/utils/lock_holder.h
@@ -12,8 +12,8 @@
  * @history
  */
 
-#ifndef _UTIL_LOCK_LOCK_HOLDER_H_
-#define _UTIL_LOCK_LOCK_HOLDER_H_
+#ifndef UTIL_LOCK_LOCK_HOLDER_H
+#define UTIL_LOCK_LOCK_HOLDER_H
 
 #pragma once
 

diff --git a/include/libcopp/utils/non_copyable.h b/include/libcopp/utils/non_copyable.h
@@ -7,8 +7,10 @@
  *  Released under the MIT license
  */
 
-#ifndef _COPP_UTILS_NON_COPYABLE_H_
-#define _COPP_UTILS_NON_COPYABLE_H_
+#ifndef COPP_UTILS_NON_COPYABLE_H
+#define COPP_UTILS_NON_COPYABLE_H
+
+#pragma once
 
 #include "libcopp/utils/config/compiler_features.h"
 

diff --git a/include/libcopp/utils/spin_lock.h b/include/libcopp/utils/spin_lock.h
@@ -23,12 +23,10 @@
  *         1. using atomic_int_type
  */
 
-#ifndef _UTIL_LOCK_SPINLOCK_H_
-#define _UTIL_LOCK_SPINLOCK_H_
+#ifndef UTIL_LOCK_SPINLOCK_H
+#define UTIL_LOCK_SPINLOCK_H
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 #pragma once
-#endif
 
 #include "atomic_int_type.h"
 

diff --git a/include/libcopp/utils/std/decltype.h b/include/libcopp/utils/std/decltype.h
@@ -11,13 +11,11 @@
  *
  */
 
-#ifndef _STD_DECLTYPE_H_
-#define _STD_DECLTYPE_H_
+#ifndef STD_DECLTYPE_H
+#define STD_DECLTYPE_H
 
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 #pragma once
-#endif
 
 #include <libcopp/utils/config/compiler_features.h>
 

diff --git a/include/libcopp/utils/std/functional.h b/include/libcopp/utils/std/functional.h
@@ -11,12 +11,10 @@
  *
  */
 
-#ifndef _STD_FUNCTIONAL_H_
-#define _STD_FUNCTIONAL_H_
+#ifndef STD_FUNCTIONAL_H
+#define STD_FUNCTIONAL_H
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 #pragma once
-#endif
 
 // ============================================================
 // 公共包含部分

diff --git a/include/libcopp/utils/std/intrusive_ptr.h b/include/libcopp/utils/std/intrusive_ptr.h
@@ -12,8 +12,8 @@
  *
  */
 
-#ifndef _STD_INTRUSIVE_PTR_H_
-#define _STD_INTRUSIVE_PTR_H_
+#ifndef STD_INTRUSIVE_PTR_H
+#define STD_INTRUSIVE_PTR_H
 
 #pragma once
 

diff --git a/include/libcopp/utils/std/smart_ptr.h b/include/libcopp/utils/std/smart_ptr.h
@@ -12,8 +12,8 @@
  *
  */
 
-#ifndef _STD_SMARTPTR_H_
-#define _STD_SMARTPTR_H_
+#ifndef STD_SMARTPTR_H
+#define STD_SMARTPTR_H
 
 #pragma once
 

diff --git a/include/libcotask/core/standard_int_id_allocator.h b/include/libcotask/core/standard_int_id_allocator.h
@@ -7,8 +7,10 @@
  *  Released under the MIT license
  */
 
-#ifndef _COTASK_CORE_STANDARD_INT_ID_ALLOCATOR_H_
-#define _COTASK_CORE_STANDARD_INT_ID_ALLOCATOR_H_
+#ifndef COTASK_CORE_STANDARD_INT_ID_ALLOCATOR_H
+#define COTASK_CORE_STANDARD_INT_ID_ALLOCATOR_H
+
+#pragma once
 
 #include <ctime>
 #include <stdint.h>

diff --git a/include/libcotask/core/standard_new_allocator.h b/include/libcotask/core/standard_new_allocator.h
@@ -7,9 +7,11 @@
  *  Released under the MIT license
  */
 
-#ifndef _COTASK_CORE_STANDARD_NEW_ALLOCATOR_H_
-#define _COTASK_CORE_STANDARD_NEW_ALLOCATOR_H_
+#ifndef COTASK_CORE_STANDARD_NEW_ALLOCATOR_H
+#define COTASK_CORE_STANDARD_NEW_ALLOCATOR_H
 
+#pragma once
+
 #include <libcopp/utils/features.h>
 #include <libcopp/utils/std/smart_ptr.h>
 

diff --git a/include/libcotask/impl/id_allocator_impl.h b/include/libcotask/impl/id_allocator_impl.h
@@ -7,8 +7,10 @@
  *  Released under the MIT license
  */
 
-#ifndef _COTASK_IMPL_ID_ALLOCATOR_IMPL_H_
-#define _COTASK_IMPL_ID_ALLOCATOR_IMPL_H_
+#ifndef COTASK_IMPL_ID_ALLOCATOR_IMPL_H
+#define COTASK_IMPL_ID_ALLOCATOR_IMPL_H
+
+#pragma once
 
 #include "libcopp/utils/config/compiler_features.h"
 

diff --git a/include/libcotask/impl/task_action_impl.h b/include/libcotask/impl/task_action_impl.h
@@ -7,8 +7,10 @@
  *  Released under the MIT license
  */
 
-#ifndef _COTASK_IMPL_TASK_ACTION_IMPL_H_
-#define _COTASK_IMPL_TASK_ACTION_IMPL_H_
+#ifndef COTASK_IMPL_TASK_ACTION_IMPL_H
+#define COTASK_IMPL_TASK_ACTION_IMPL_H
+#pragma once
+
 namespace cotask {
 
     namespace impl {

diff --git a/include/libcotask/impl/task_impl.h b/include/libcotask/impl/task_impl.h
@@ -7,8 +7,10 @@
  *  Released under the MIT license
  */
 
-#ifndef _COTASK_IMPL_TASK_IMPL_H_
-#define _COTASK_IMPL_TASK_IMPL_H_
+#ifndef COTASK_IMPL_TASK_IMPL_H
+#define COTASK_IMPL_TASK_IMPL_H
+
+#pragma once
 
 #include <list>
 #include <stdint.h>

diff --git a/include/libcotask/task.h b/include/libcotask/task.h
@@ -7,8 +7,10 @@
  *  Released under the MIT license
  */
 
-#ifndef _COTASK_TASK_H_
-#define _COTASK_TASK_H_
+#ifndef COTASK_TASK_H
+#define COTASK_TASK_H
+
+#pragma once
 
 #include <algorithm>
 #include <stdint.h>

diff --git a/include/libcotask/task_actions.h b/include/libcotask/task_actions.h
@@ -7,8 +7,10 @@
  *  Released under the MIT license
  */
 
-#ifndef _COTASK_TASK_ACTIONS_H_
-#define _COTASK_TASK_ACTIONS_H_
+#ifndef COTASK_TASK_ACTIONS_H
+#define COTASK_TASK_ACTIONS_H
+
+#pragma once
 
 #include <libcotask/impl/task_action_impl.h>
 

diff --git a/include/libcotask/task_macros.h b/include/libcotask/task_macros.h
@@ -7,8 +7,10 @@
  *  Released under the MIT license
  */
 
-#ifndef _COTASK_TASK_MACROS_H_
-#define _COTASK_TASK_MACROS_H_
+#ifndef COTASK_TASK_MACROS_H
+#define COTASK_TASK_MACROS_H
+
+#pragma once
 
 #include <stdint.h>
 

diff --git a/include/libcotask/task_manager.h b/include/libcotask/task_manager.h
@@ -7,8 +7,10 @@
  *  Released under the MIT license
  */
 
-#ifndef _COTASK_TASK_MANAGER_H_
-#define _COTASK_TASK_MANAGER_H_
+#ifndef COTASK_TASK_MANAGER_H
+#define COTASK_TASK_MANAGER_H
+
+#pragma once
 
 #include <algorithm>
 #include <assert.h>

diff --git a/include/libcotask/this_task.h b/include/libcotask/this_task.h
@@ -7,8 +7,10 @@
  *  Released under the MIT license
  */
 
-#ifndef _COTASK_THIS_TASK_H_
-#define _COTASK_THIS_TASK_H_
+#ifndef COTASK_THIS_TASK_H
+#define COTASK_THIS_TASK_H
+
+#pragma once
 
 #include <libcotask/impl/task_impl.h>