StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

export column_t friend functions, attempt to exclude test headers from coveralls

Browse Source
This commit is contained in:
Thomas Fussell 2016-07-09 14:21:10 -04:00
parent f70e4db1e1
commit 24b966cf86
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -56,4 +56,4 @@ after_success:
- if [ "$COMPILER" = "g++-4.9" ]; then cd .. && ./build/bin/xlnt.test ; fi
- if [ "$COMPILER" = "g++-4.9" ]; then export OLDWD=$(pwd) ; fi
- if [ "$COMPILER" = "g++-4.9" ]; then cd "build/CMakeFiles/xlnt.static.dir$(pwd)" ; pwd ; fi
- if [ "$COMPILER" = "g++-4.9" ]; then coveralls --root $OLDWD --verbose -x ".cpp" --gcov-options '\-p' --exclude include --exclude third-party --exclude tests --exclude samples --exclude benchmarks ; fi
- if [ "$COMPILER" = "g++-4.9" ]; then coveralls --root $OLDWD --verbose -x ".cpp" --gcov-options '\-p' --exclude include --exclude third-party --exclude tests --exclude samples --exclude benchmarks --exclude-pattern "^source/.*/tests/*.hpp$" ; fi

20
include/xlnt/cell/index_types.hpp
View File

@ -231,27 +231,27 @@ public:
/// <summary>
/// Return the result of adding rhs to this column.
/// </summary>
friend column_t operator+(column_t lhs, const column_t& rhs);
friend XLNT_FUNCTION column_t operator+(column_t lhs, const column_t& rhs);
/// <summary>
/// Return the result of subtracing lhs by rhs column.
/// </summary>
friend column_t operator-(column_t lhs, const column_t& rhs);
friend XLNT_FUNCTION column_t operator-(column_t lhs, const column_t& rhs);
/// <summary>
/// Return the result of multiply lhs by rhs column.
/// </summary>
friend column_t operator*(column_t lhs, const column_t& rhs);
friend XLNT_FUNCTION column_t operator*(column_t lhs, const column_t& rhs);
/// <summary>
/// Return the result of divide lhs by rhs column.
/// </summary>
friend column_t operator/(column_t lhs, const column_t& rhs);
friend XLNT_FUNCTION column_t operator/(column_t lhs, const column_t& rhs);
/// <summary>
/// Return the result of mod lhs by rhs column.
/// </summary>
friend column_t operator%(column_t lhs, const column_t& rhs);
friend XLNT_FUNCTION column_t operator%(column_t lhs, const column_t& rhs);
/// <summary>
/// Add rhs to this column and return a reference to this column.
@ -281,27 +281,27 @@ public:
/// <summary>
/// Return true if other is to the right of this column.
/// </summary>
friend bool operator>(const column_t::index_t &left, const column_t &right);
friend XLNT_FUNCTION bool operator>(const column_t::index_t &left, const column_t &right);
/// <summary>
/// Return true if other is to the right of or equal to this column.
/// </summary>
friend bool operator>=(const column_t::index_t &left, const column_t &right);
friend XLNT_FUNCTION bool operator>=(const column_t::index_t &left, const column_t &right);
/// <summary>
/// Return true if other is to the left of this column.
/// </summary>
friend bool operator<(const column_t::index_t &left, const column_t &right);
friend XLNT_FUNCTION bool operator<(const column_t::index_t &left, const column_t &right);
/// <summary>
/// Return true if other is to the left of or equal to this column.
/// </summary>
friend bool operator<=(const column_t::index_t &left, const column_t &right);
friend XLNT_FUNCTION bool operator<=(const column_t::index_t &left, const column_t &right);
/// <summary>
/// Swap the columns that left and right refer to.
/// </summary>
friend void swap(column_t &left, column_t &right);
friend XLNT_FUNCTION void swap(column_t &left, column_t &right);
/// <summary>
/// Internal numeric value of this column index.

5
source/cell/tests/test_index_types.hpp
View File

@ -62,5 +62,10 @@ public:
TS_ASSERT(!(c2 <= 3));
TS_ASSERT(c1 >= 3);
TS_ASSERT(!(c1 >= 4));
TS_ASSERT(4 >= c2);
TS_ASSERT(!(3 >= c2));
TS_ASSERT(3 <= c1);
TS_ASSERT(!(4 <= c1));
}
};