From 0d643585350d4421e4d5201dbe2ddaf9a7a95f7c Mon Sep 17 00:00:00 2001 From: tsntsumi Date: Fri, 9 May 2014 23:32:33 +0900 Subject: [PATCH] deleted the ineffective keyword inline. As for ineffective inline, LLVM 5.1 came to take out a Warning. --- examples/complex/complex.h | 4 ++-- src/ccunit/CCUnitList.h | 9 ++++----- src/ccunit/CCUnitLogMessage.h | 8 ++++---- src/ccunit/CCUnitMakeSuite.h | 2 +- src/ccunit/CCUnitTestCase.h | 4 ++-- src/ccunit/CCUnitTestFunc.h | 7 ------- src/ccunit/CCUnitTestResult.h | 12 ++++++------ src/ccunit/CCUnitTestRunner.h | 4 ++-- src/ccunit/CCUnitTestSuite.h | 12 ++++++------ 9 files changed, 27 insertions(+), 35 deletions(-) diff --git a/examples/complex/complex.h b/examples/complex/complex.h index 4aa76b2..48f9fd0 100644 --- a/examples/complex/complex.h +++ b/examples/complex/complex.h @@ -32,12 +32,12 @@ typedef struct complex_t } complex_t; extern complex_t* complex_new (double real, double imaginary); -extern inline void complex_delete (const complex_t* cp); +extern void complex_delete (const complex_t* cp); extern char* complex_to_string (const complex_t* cp); extern complex_t* complex_add (complex_t* z, const complex_t* x, const complex_t* y); extern complex_t* complex_sub (complex_t* z, const complex_t* x, const complex_t* y); extern complex_t* complex_mul (complex_t* z, const complex_t* x, const complex_t* y); extern complex_t* complex_div (complex_t* z, const complex_t* x, const complex_t* y); -extern inline int complex_equals (const complex_t*x, const complex_t* y); +extern int complex_equals (const complex_t*x, const complex_t* y); #endif /* COMPLEX_H */ diff --git a/src/ccunit/CCUnitList.h b/src/ccunit/CCUnitList.h index 9124eff..f2f3ebe 100755 --- a/src/ccunit/CCUnitList.h +++ b/src/ccunit/CCUnitList.h @@ -53,7 +53,7 @@ typedef struct CCUnitList * Create new list object. * @return new list object. */ -extern inline CCUnitList* ccunit_newList (); +extern CCUnitList* ccunit_newList (); /** * Add element to list object. @@ -107,16 +107,15 @@ extern CCUnitListIterator* ccunit_newListIterator (const struct CCUnitList* list * @param it Iterator to initialize. * @return Initialized iterator. */ -extern inline -CCUnitListIterator* ccunit_initListIterator (const struct CCUnitList* list, - struct CCUnitListIterator* it); +extern CCUnitListIterator* ccunit_initListIterator (const struct CCUnitList* list, + struct CCUnitListIterator* it); /** * delete list iterator. * * @param it iterator to delete. */ -extern inline void ccunit_deleteListIterator (struct CCUnitListIterator* it); +extern void ccunit_deleteListIterator (struct CCUnitListIterator* it); /** * Get next element. diff --git a/src/ccunit/CCUnitLogMessage.h b/src/ccunit/CCUnitLogMessage.h index 74485b4..b28cab7 100644 --- a/src/ccunit/CCUnitLogMessage.h +++ b/src/ccunit/CCUnitLogMessage.h @@ -52,7 +52,7 @@ extern bool _ccunit_verbose_message; * @param fmt message format string. * @param ... message arguments. */ -extern inline void ccunit_dbg (const char* fmt, ...) +extern void ccunit_dbg (const char* fmt, ...) __attribute__ ((format (printf, 1, 2))); /** @@ -60,7 +60,7 @@ extern inline void ccunit_dbg (const char* fmt, ...) * @param fmt message format string. * @param ... message arguments. */ -extern inline void ccunit_log (const char* fmt, ...) +extern void ccunit_log (const char* fmt, ...) __attribute__ ((format (printf, 1, 2))); /** @@ -68,7 +68,7 @@ extern inline void ccunit_log (const char* fmt, ...) * @param fmt message format string. * @param ... message arguments. */ -extern inline void ccunit_err (const char* fmt, ...) +extern void ccunit_err (const char* fmt, ...) __attribute__ ((format (printf, 1, 2))); /** @@ -76,7 +76,7 @@ extern inline void ccunit_err (const char* fmt, ...) * @param fmt message format string. * @param ... message arguments. */ -extern inline void ccunit_msg (const char* fmt, ...) +extern void ccunit_msg (const char* fmt, ...) __attribute__ ((format (printf, 1, 2))); /** @} */ diff --git a/src/ccunit/CCUnitMakeSuite.h b/src/ccunit/CCUnitMakeSuite.h index b203928..4386a3d 100644 --- a/src/ccunit/CCUnitMakeSuite.h +++ b/src/ccunit/CCUnitMakeSuite.h @@ -134,7 +134,7 @@ extern _CCUnitTestSuiteDef* ccunit_newTestSuiteDef (const char* name); * * @param suite test suite def. */ -extern inline void ccunit_deleteTestSuiteDef (_CCUnitTestSuiteDef* suite); +extern void ccunit_deleteTestSuiteDef (_CCUnitTestSuiteDef* suite); /** @} */ diff --git a/src/ccunit/CCUnitTestCase.h b/src/ccunit/CCUnitTestCase.h index 5e25f52..76b31df 100755 --- a/src/ccunit/CCUnitTestCase.h +++ b/src/ccunit/CCUnitTestCase.h @@ -159,7 +159,7 @@ extern CCUnitTestCase* ccunit_newTestCase (const char* name); * @param testCase deleting case. * @ingroup WritingTestCase */ -extern inline void ccunit_deleteTestCase (CCUnitTestCase* testCase); +extern void ccunit_deleteTestCase (CCUnitTestCase* testCase); /** * add test function to test case. @@ -192,7 +192,7 @@ extern CCUnitTestFunc* ccunit_addNewTestFunc (CCUnitTestCase* testCase, * @return test result. * @ingroup ExecutingTest */ -extern inline struct CCUnitTestResult* ccunit_runTestCase (CCUnitTestCase* testCase); +extern struct CCUnitTestResult* ccunit_runTestCase (CCUnitTestCase* testCase); /** @} */ #endif diff --git a/src/ccunit/CCUnitTestFunc.h b/src/ccunit/CCUnitTestFunc.h index 375c62d..e1ed8c8 100755 --- a/src/ccunit/CCUnitTestFunc.h +++ b/src/ccunit/CCUnitTestFunc.h @@ -99,13 +99,6 @@ extern CCUnitTestFunc* ccunit_newTestFunc (const char* name, */ extern void ccunit_deleteTestFunc (CCUnitTestFunc* f); -/** - * Delete test function. - * @param f deleting function. - * @ingroup WritingTestCase - */ -extern inline void ccunit_deleteTestFunc (CCUnitTestFunc* f); - /** @} */ #endif /* !CCUNITTESTFUNC_H */ diff --git a/src/ccunit/CCUnitTestResult.h b/src/ccunit/CCUnitTestResult.h index 2f99571..7ad5e6e 100644 --- a/src/ccunit/CCUnitTestResult.h +++ b/src/ccunit/CCUnitTestResult.h @@ -91,7 +91,7 @@ extern void ccunit_addFailure (CCUnitTestResult* result, * @param listener adding listener. * @ingroup TrackingTestExecution */ -extern inline void ccunit_addResultListener (CCUnitTestResult* result, +extern void ccunit_addResultListener (CCUnitTestResult* result, CCUnitTestListener* listener); /** @@ -99,35 +99,35 @@ extern inline void ccunit_addResultListener (CCUnitTestResult* result, * @param result result object. * @ingroup TrackingTestExecution */ -extern inline CCUnitListIterator* ccunit_failures(CCUnitTestResult* result); +extern CCUnitListIterator* ccunit_failures(CCUnitTestResult* result); /** * Gets the number of detected failures. * @param result result object. * @ingroup TrackingTestExecution */ -extern inline size_t ccunit_failureCount (CCUnitTestResult* result); +extern size_t ccunit_failureCount (CCUnitTestResult* result); /** * Returns whether the entire test was successful or not. * @param result result object. * @ingroup TrackingTestExecution */ -extern inline bool ccunit_wasSuccessful (CCUnitTestResult* result); +extern bool ccunit_wasSuccessful (CCUnitTestResult* result); /** * Marks that the test run should stop. * @param result result object. * @ingroup TrackingTestExecution */ -extern inline void ccunit_stopTest (CCUnitTestResult* result); +extern void ccunit_stopTest (CCUnitTestResult* result); /** * Gets the number of run tests. * @param result result object. * @ingroup TrackingTestExecution */ -extern inline size_t ccunit_runCount (CCUnitTestResult* result); +extern size_t ccunit_runCount (CCUnitTestResult* result); /** @} */ diff --git a/src/ccunit/CCUnitTestRunner.h b/src/ccunit/CCUnitTestRunner.h index b2e5d7f..522fc76 100644 --- a/src/ccunit/CCUnitTestRunner.h +++ b/src/ccunit/CCUnitTestRunner.h @@ -96,7 +96,7 @@ extern void ccunit_deleteTestRunner (CCUnitTestRunner* runner); * @return 0 if succeeded, -1 if error occurred. * @ingroup ExecutingTest */ -extern inline int ccunit_runTestRunner (CCUnitTestRunner* runner, +extern int ccunit_runTestRunner (CCUnitTestRunner* runner, CCUnitTestSuite* suite); /** @@ -105,7 +105,7 @@ extern inline int ccunit_runTestRunner (CCUnitTestRunner* runner, * @param runner test runner. * @return test result object. */ -extern inline CCUnitTestResult* ccunit_getResult (CCUnitTestRunner* runner); +extern CCUnitTestResult* ccunit_getResult (CCUnitTestRunner* runner); /** @} */ diff --git a/src/ccunit/CCUnitTestSuite.h b/src/ccunit/CCUnitTestSuite.h index 328b1f7..d015b7a 100755 --- a/src/ccunit/CCUnitTestSuite.h +++ b/src/ccunit/CCUnitTestSuite.h @@ -75,7 +75,7 @@ typedef struct CCUnitTestSuiteDfn * @return new test suite. * @ingroup CreatingTestSuite */ -extern inline CCUnitTestSuite* ccunit_newTestSuite(const char* name); +extern CCUnitTestSuite* ccunit_newTestSuite(const char* name); /** * Constructs a TestSuite from definition struct. @@ -89,7 +89,7 @@ extern CCUnitTestSuite* ccunit_newTestSuiteFromDfn (const CCUnitTestSuiteDfn* sd * @param suite deleting suite. * @ingroup CreatingTestSuite */ -extern inline void ccunit_deleteTestSuite (CCUnitTestSuite* suite); +extern void ccunit_deleteTestSuite (CCUnitTestSuite* suite); /** * Adds a test to the suite. @@ -97,7 +97,7 @@ extern inline void ccunit_deleteTestSuite (CCUnitTestSuite* suite); * @param test test to add. * @ingroup CreatingTestSuite */ -extern inline void ccunit_addTest (CCUnitTestSuite* suite, CCUnitTest* test); +extern void ccunit_addTest (CCUnitTestSuite* suite, CCUnitTest* test); /** * Adds a test suite to the suite. @@ -105,7 +105,7 @@ extern inline void ccunit_addTest (CCUnitTestSuite* suite, CCUnitTest* test); * @param testSuite test to add. * @ingroup CreatingTestSuite */ -extern inline void ccunit_addTestSuite (CCUnitTestSuite* suite, +extern void ccunit_addTestSuite (CCUnitTestSuite* suite, CCUnitTestSuite* testSuite); /** @@ -114,7 +114,7 @@ extern inline void ccunit_addTestSuite (CCUnitTestSuite* suite, * @param testCase test case to add. * @ingroup CreatingTestSuite */ -extern inline void ccunit_addTestCase (CCUnitTestSuite* suite, +extern void ccunit_addTestCase (CCUnitTestSuite* suite, CCUnitTestCase* testCase); /** @@ -124,7 +124,7 @@ extern inline void ccunit_addTestCase (CCUnitTestSuite* suite, * @return test result. * @ingroup ExecutingTest */ -extern inline CCUnitTestResult* ccunit_runTestSuite (CCUnitTestSuite* suite, +extern CCUnitTestResult* ccunit_runTestSuite (CCUnitTestSuite* suite, CCUnitTestResult* result); /** -- 2.11.0