Zorba

Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

  1. pjl-misc
  2. Merge into trunk
Proposed by Paul J. Lucas
Status: Merged
Approved by: Matthias Brantner
Approved revision: 11050
Merged at revision: 11203
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 12 lines (+1/-1)
1 file modified
include/zorba/internal/ztd.h (+1/-1)
To merge this branch: bzr merge lp:~paul-lucas/zorba/pjl-misc
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Paul J. Lucas Approve
Review via email: mp+145448@code.launchpad.net

Commit message

Fixed scoping of ZORBA_DECL_HAS_MEM_FN macro.

Description of the change

Fixed scoping of ZORBA_DECL_HAS_MEM_FN macro.

To post a comment you must log in.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-29T17-58-59.969Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job pjl-misc-2013-01-29T17-58-59.969Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/zorba/internal/ztd.h'
2--- include/zorba/internal/ztd.h 2013-01-25 22:23:32 +0000
3+++ include/zorba/internal/ztd.h 2013-01-29 17:52:30 +0000
4@@ -72,7 +72,7 @@
5 */
6 #define ZORBA_DECL_HAS_MEM_FN(FN_NAME) \
7 template<typename T,typename S> \
8- class has_##FN_NAME : public sfinae_base { \
9+ class has_##FN_NAME : public ::zorba::internal::ztd::sfinae_base { \
10 template<typename SignatureType,SignatureType> struct type_check; \
11 template<class U> static yes& test(type_check<S,&U::FN_NAME>*); \
12 template<class U> static no& test(...); \

Subscribers

People subscribed via source and target branches