Skip to content

Commit e08d088

Browse files
eddelbuetteleddelbuettel
committed
suppresses some compiler warnings
1 parent 4e300ae commit e08d088

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

‎ChangeLog‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* DESCRIPTION (Version, Date): Roll minor version
44
* inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem
55

6+
* inst/include/Rcpp/exceptions/cpp98/exceptions.h
7+
(RCPP_ADVANCED_EXCEPTION_CLASS): Suppressing some warnings
8+
69
2017-04-20 James J Balamuta <[email protected]>
710

811
* inst/include/Rcpp/api/meat/DottedPairImpl.h: Corrected format

‎inst/include/Rcpp/exceptions/cpp98/exceptions.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,38 +29,38 @@ namespace Rcpp {
2929
class __CLASS__ : public std::exception{ \
3030
public: \
3131
__CLASS__( ) throw() : message( std::string(__WHAT__) + "." ){} ; \
32-
__CLASS__( const std::string& message ) throw() : message( std::string(__WHAT__) + ": " + message + "." ){} ; \
32+
__CLASS__( const std::string& message ) throw() : message( std::string(__WHAT__) + ": " + message + "." ){} \
3333
template <typename T1> \
3434
__CLASS__(const char* fmt, const T1& arg1) throw() : \
35-
message( tfm::format(fmt, arg1 ) ){} ; \
35+
message( tfm::format(fmt, arg1 ) ){} \
3636
template <typename T1, typename T2> \
3737
__CLASS__(const char* fmt, const T1& arg1, const T2& arg2) throw() : \
38-
message( tfm::format(fmt, arg1, arg2 ) ){} ; \
38+
message( tfm::format(fmt, arg1, arg2 ) ){} \
3939
template <typename T1, typename T2, typename T3> \
4040
__CLASS__(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3) throw() : \
41-
message( tfm::format(fmt, arg1, arg2, arg3 ) ){} ; \
41+
message( tfm::format(fmt, arg1, arg2, arg3 ) ){} \
4242
template <typename T1, typename T2, typename T3, typename T4> \
4343
__CLASS__(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4) throw() : \
44-
message( tfm::format(fmt, arg1, arg2, arg3, arg4 ) ){} ; \
44+
message( tfm::format(fmt, arg1, arg2, arg3, arg4 ) ){} \
4545
template <typename T1, typename T2, typename T3, typename T4, typename T5> \
4646
__CLASS__(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5) throw() : \
47-
message( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5 ) ){} ; \
47+
message( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5 ) ){} \
4848
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6> \
4949
__CLASS__(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6) throw() : \
50-
message( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6 ) ){} ; \
50+
message( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6 ) ){} \
5151
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7> \
5252
__CLASS__(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7) throw() : \
53-
message( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7 ) ){} ; \
53+
message( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7 ) ){} \
5454
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> \
5555
__CLASS__(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7, const T8& arg8) throw() : \
56-
message( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8 ) ){} ; \
56+
message( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8 ) ){} \
5757
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9> \
5858
__CLASS__(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7, const T8& arg8, const T9& arg9) throw() : \
59-
message( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9 ) ){} ; \
59+
message( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9 ) ){} \
6060
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10> \
6161
__CLASS__(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7, const T8& arg8, const T9& arg9, const T10& arg10) throw() : \
62-
message( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10 ) ){} ; \
63-
virtual ~__CLASS__() throw(){} ; \
62+
message( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10 ) ){} \
63+
virtual ~__CLASS__() throw(){} \
6464
virtual const char* what() const throw() { return message.c_str() ; } \
6565
private: \
6666
std::string message ; \

0 commit comments

Comments
 (0)