fix compile problem in MSVC

habemus-papadum · Jan 23, 2018 · de688db · de688db
1 parent 83a2b12
commit de688db
Show file tree

Hide file tree

Showing 7 changed files with 336 additions and 326 deletions.
diff --git a/include/libcopp/utils/atomic_int_type.h b/include/libcopp/utils/atomic_int_type.h
@@ -83,8 +83,10 @@ namespace util {
         private:
             ::std::atomic<value_type> data_;
             atomic_int_type(const atomic_int_type &) UTIL_CONFIG_DELETED_FUNCTION;
-            atomic_int_type<value_type> &operator=(const atomic_int_type<value_type> &) UTIL_CONFIG_DELETED_FUNCTION;
-            atomic_int_type<value_type> &operator=(const atomic_int_type<value_type> &) volatile UTIL_CONFIG_DELETED_FUNCTION;
+#ifndef _MSC_VER
+            atomic_int_type &operator=(const atomic_int_type &) UTIL_CONFIG_DELETED_FUNCTION;
+            atomic_int_type &operator=(const atomic_int_type &) volatile UTIL_CONFIG_DELETED_FUNCTION;
+#endif
 
         public:
             atomic_int_type() UTIL_CONFIG_NOEXCEPT : data_() {}
@@ -309,8 +311,10 @@ namespace util {
             volatile value_type data_;
 #endif
             atomic_int_type(const atomic_int_type &) UTIL_CONFIG_DELETED_FUNCTION;
-            atomic_int_type<value_type> &operator=(const atomic_int_type<value_type> &) UTIL_CONFIG_DELETED_FUNCTION;
-            atomic_int_type<value_type> &operator=(const atomic_int_type<value_type> &) volatile UTIL_CONFIG_DELETED_FUNCTION;
+#ifndef _MSC_VER
+            atomic_int_type &operator=(const atomic_int_type &) UTIL_CONFIG_DELETED_FUNCTION;
+            atomic_int_type &operator=(const atomic_int_type &) volatile UTIL_CONFIG_DELETED_FUNCTION;
+#endif
 
         public:
             atomic_int_type() UTIL_CONFIG_NOEXCEPT : data_() {}
@@ -848,8 +852,10 @@ namespace util {
         private:
             value_type data_;
             atomic_int_type(const atomic_int_type &) UTIL_CONFIG_DELETED_FUNCTION;
-            atomic_int_type<value_type> &operator=(const atomic_int_type<value_type> &) UTIL_CONFIG_DELETED_FUNCTION;
-            atomic_int_type<value_type> &operator=(const atomic_int_type<value_type> &) volatile UTIL_CONFIG_DELETED_FUNCTION;
+#ifndef _MSC_VER
+            atomic_int_type &operator=(const atomic_int_type &) UTIL_CONFIG_DELETED_FUNCTION;
+            atomic_int_type &operator=(const atomic_int_type &) volatile UTIL_CONFIG_DELETED_FUNCTION;
+#endif
 
         public:
             atomic_int_type() UTIL_CONFIG_NOEXCEPT : data_() {}

diff --git a/include/libcopp/utils/config/compiler_features.h b/include/libcopp/utils/config/compiler_features.h
@@ -124,7 +124,7 @@
 # undef UTIL_CONFIG_COMPILER_IS_ADSP
 # define UTIL_CONFIG_COMPILER_IS_ADSP 1
 
-#elif defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)
+#elif defined(__IAR_SYSTEMS_ICC__ ) || defined(__IAR_SYSTEMS_ICC)
 # undef UTIL_CONFIG_COMPILER_IS_IAR
 # define UTIL_CONFIG_COMPILER_IS_IAR 1
 

diff --git a/include/libcopp/utils/errno.h b/include/libcopp/utils/errno.h
@@ -1,37 +1,37 @@
 #ifndef COPP_UTILS_ERRNO_H
 #define COPP_UTILS_ERRNO_H
-
-
-#pragma once
-
-namespace copp {
-    /**
-     * error code
-     */
-    enum copp_error_code {
-        COPP_EC_SUCCESS = 0, //!< COPP_EC_SUCCESS
-
-        COPP_EC_UNKNOWN = -101,                //!< COPP_EC_UNKNOWN
-        COPP_EC_EXTERNAL_INSERT_FAILED = -102, //!< COPP_EC_EXTERNAL_INSERT_FAILED
-        COPP_EC_EXTERNAL_ERASE_FAILED = -103,  //!< COPP_EC_EXTERNAL_ERASE_FAILED
-        COPP_EC_IN_RESET = -104,               //!< COPP_EC_IN_RESET
-
-        COPP_EC_ALLOC_STACK_FAILED = -201, //!< COPP_EC_ALLOC_STACK_FAILED
-
-        COPP_EC_NOT_INITED = -1001,       //!< COPP_EC_NOT_INITED
-        COPP_EC_ALREADY_INITED = -1002,   //!< COPP_EC_ALREADY_INITED
-        COPP_EC_ACCESS_VIOLATION = -1003, //!< COPP_EC_ACCESS_VIOLATION
-        COPP_EC_NOT_READY = -1004,        //!< COPP_EC_NOT_READY
-        COPP_EC_NOT_RUNNING = -1005,      //!< COPP_EC_NOT_RUNNING
-        COPP_EC_IS_RUNNING = -1006,       //!< COPP_EC_IS_RUNNING
-        COPP_EC_ALREADY_FINISHED = -1007, //!< COPP_EC_ALREADY_FINISHED
-        COPP_EC_NOT_FOUND = -1008,        //!< COPP_EC_NOT_FOUND
-        COPP_EC_ALREADY_EXIST = -1009,    //!< COPP_EC_ALREADY_EXIST
-        COPP_EC_ARGS_ERROR = -1010,       //!< COPP_EC_ARGS_ERROR
-        COPP_EC_CAST_FAILED = -1011,      //!< COPP_EC_CAST_FAILED
-
-        COPP_EC_FCONTEXT_MAKE_FAILED = -2001, //!< COPP_EC_FCONTEXT_MAKE_FAILED
-    };
-}
-
-#endif
+
+
+#pragma once
+
+namespace copp {
+    /**
+     * error code
+     */
+    enum copp_error_code {
+        COPP_EC_SUCCESS = 0, //!< COPP_EC_SUCCESS
+
+        COPP_EC_UNKNOWN = -101,                //!< COPP_EC_UNKNOWN
+        COPP_EC_EXTERNAL_INSERT_FAILED = -102, //!< COPP_EC_EXTERNAL_INSERT_FAILED
+        COPP_EC_EXTERNAL_ERASE_FAILED = -103,  //!< COPP_EC_EXTERNAL_ERASE_FAILED
+        COPP_EC_IN_RESET = -104,               //!< COPP_EC_IN_RESET
+
+        COPP_EC_ALLOC_STACK_FAILED = -201, //!< COPP_EC_ALLOC_STACK_FAILED
+
+        COPP_EC_NOT_INITED = -1001,       //!< COPP_EC_NOT_INITED
+        COPP_EC_ALREADY_INITED = -1002,   //!< COPP_EC_ALREADY_INITED
+        COPP_EC_ACCESS_VIOLATION = -1003, //!< COPP_EC_ACCESS_VIOLATION
+        COPP_EC_NOT_READY = -1004,        //!< COPP_EC_NOT_READY
+        COPP_EC_NOT_RUNNING = -1005,      //!< COPP_EC_NOT_RUNNING
+        COPP_EC_IS_RUNNING = -1006,       //!< COPP_EC_IS_RUNNING
+        COPP_EC_ALREADY_FINISHED = -1007, //!< COPP_EC_ALREADY_FINISHED
+        COPP_EC_NOT_FOUND = -1008,        //!< COPP_EC_NOT_FOUND
+        COPP_EC_ALREADY_EXIST = -1009,    //!< COPP_EC_ALREADY_EXIST
+        COPP_EC_ARGS_ERROR = -1010,       //!< COPP_EC_ARGS_ERROR
+        COPP_EC_CAST_FAILED = -1011,      //!< COPP_EC_CAST_FAILED
+
+        COPP_EC_FCONTEXT_MAKE_FAILED = -2001, //!< COPP_EC_FCONTEXT_MAKE_FAILED
+    };
+} // namespace copp
+
+#endif