qpid/messaging/Session.h r928855 breaks Windows build - macro conflict
----------------------------------------------------------------------

                 Key: QPID-2475
                 URL: https://issues.apache.org/jira/browse/QPID-2475
             Project: Qpid
          Issue Type: Bug
          Components: C++ Client
    Affects Versions: 0.7
         Environment: Windows
            Reporter: Steve Huston


this change broke on Windows:

Index: C:/qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h
===================================================================
--- C:/qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h     (revision 
928854)
+++ C:/qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h     (revision 
928855)
@@ -102,7 +102,7 @@
      * which case the passed in receiver reference will be set to the
      * receiver for that message or false if no message was available.
      */
-    QPID_CLIENT_EXTERN bool nextReceiver(Receiver&, Duration 
timeout=INFINITE_DURATION);
+    QPID_CLIENT_EXTERN bool nextReceiver(Receiver&, Duration 
timeout=Duration::INFINITE);
     /**
      * Returns the receiver for the next available message. If there
      * are no available messages at present the call will block for up
@@ -111,7 +111,7 @@
      *...@exception Receiver::NoMessageAvailable if no message became 
available in
      * time.
      */
-    QPID_CLIENT_EXTERN Receiver nextReceiver(Duration 
timeout=INFINITE_DURATION);
+    QPID_CLIENT_EXTERN Receiver nextReceiver(Duration 
timeout=Duration::INFINITE);
     
     /**
      * Create a new sender through which messages can be sent to the

Apparantly INFINITE is a macro brought in somewhere in Windows:

C:\qpid\trunk\qpid\cpp\include\qpid/messaging/Session.h(105) : error C2589: 
'constant' : illegal token on right side of '::'
C:\qpid\trunk\qpid\cpp\include\qpid/messaging/Session.h(114) : error C2589: 
'constant' : illegal token on right side of '::'


-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:[email protected]

Reply via email to