Skip to content

Commit 44c4320

Browse files
committed
minor edit to make 'g++ -pedantic' happy
1 parent f183104 commit 44c4320

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2014-03-08 Dirk Eddelbuettel <[email protected]>
2+
3+
* inst/include/Rcpp/proxy/Binding.h: Remove spurious ';' [g++ -pedantic]
4+
* inst/include/Rcpp/proxy/ProtectedProxy.h: Idem
5+
* inst/include/Rcpp/proxy/TagProxy.h: Idem
6+
* inst/include/Rcpp/proxy/AttributeProxy.h: Idem
7+
18
2014-03-05 Kevin Ushey <[email protected]>
29

310
* inst/include/Rcpp/proxy/FieldProxy.h: bandaid for protection issue

inst/include/Rcpp/proxy/AttributeProxy.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ class AttributeProxyPolicy {
3838
template <typename T> AttributeProxy& operator=(const T& rhs) {
3939
set( wrap( rhs ) );
4040
return *this;
41-
} ;
41+
}
4242

4343
template <typename T> operator T() const {
4444
return as<T>( get() );
45-
};
45+
}
4646

4747
inline operator SEXP() const {
4848
return get() ;
@@ -67,7 +67,7 @@ class AttributeProxyPolicy {
6767

6868
template <typename T> operator T() const {
6969
return as<T>( get() );
70-
};
70+
}
7171
inline operator SEXP() const {
7272
return get() ;
7373
}

inst/include/Rcpp/proxy/Binding.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ class BindingPolicy {
5353
template <typename WRAPPABLE> Binding& operator=(const WRAPPABLE& rhs) {
5454
set( wrap(rhs) );
5555
return *this;
56-
} ;
56+
}
5757
template <typename T> operator T() const {
5858
return as<T>( get() );
59-
} ;
59+
}
6060

6161
private:
6262

@@ -88,7 +88,7 @@ class BindingPolicy {
8888
}
8989
template <typename T> operator T() const {
9090
return as<T>( get() );
91-
} ;
91+
}
9292

9393
private:
9494

inst/include/Rcpp/proxy/ProtectedProxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ namespace Rcpp{
6565
template <typename U>
6666
operator U() const {
6767
return as<U>( get() );
68-
};
68+
}
6969

7070
operator SEXP() const{
7171
return get() ;

inst/include/Rcpp/proxy/TagProxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ namespace Rcpp{
6464
template <typename U>
6565
operator U() const {
6666
return as<U>( get() );
67-
};
67+
}
6868

6969
operator SEXP() const {
7070
return get();

0 commit comments

Comments
 (0)