qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject svn commit: r1584360 - in /qpid/branches/0.28/qpid/cpp/src/qpid: RangeSet.h broker/MessageBuilder.h broker/SelectorToken.cpp sys/unordered_map.h
Date Thu, 03 Apr 2014 19:51:53 GMT
Author: astitcher
Date: Thu Apr  3 19:51:52 2014
New Revision: 1584360

URL: http://svn.apache.org/r1584360
Log:
QPID-5658: Small changes to compile with clang's libc++

Modified:
    qpid/branches/0.28/qpid/cpp/src/qpid/RangeSet.h
    qpid/branches/0.28/qpid/cpp/src/qpid/broker/MessageBuilder.h
    qpid/branches/0.28/qpid/cpp/src/qpid/broker/SelectorToken.cpp
    qpid/branches/0.28/qpid/cpp/src/qpid/sys/unordered_map.h

Modified: qpid/branches/0.28/qpid/cpp/src/qpid/RangeSet.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.28/qpid/cpp/src/qpid/RangeSet.h?rev=1584360&r1=1584359&r2=1584360&view=diff
==============================================================================
--- qpid/branches/0.28/qpid/cpp/src/qpid/RangeSet.h (original)
+++ qpid/branches/0.28/qpid/cpp/src/qpid/RangeSet.h Thu Apr  3 19:51:52 2014
@@ -26,7 +26,9 @@
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/operators.hpp>
 #include <boost/bind.hpp>
+
 #include <algorithm>
+#include <iostream>
 #include <numeric>
 
 namespace qpid {

Modified: qpid/branches/0.28/qpid/cpp/src/qpid/broker/MessageBuilder.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.28/qpid/cpp/src/qpid/broker/MessageBuilder.h?rev=1584360&r1=1584359&r2=1584360&view=diff
==============================================================================
--- qpid/branches/0.28/qpid/cpp/src/qpid/broker/MessageBuilder.h (original)
+++ qpid/branches/0.28/qpid/cpp/src/qpid/broker/MessageBuilder.h Thu Apr  3 19:51:52 2014
@@ -26,6 +26,8 @@
 #include "qpid/framing/SequenceNumber.h"
 #include "qpid/RefCounted.h"
 
+#include <string>
+
 #include <boost/intrusive_ptr.hpp>
 
 namespace qpid {

Modified: qpid/branches/0.28/qpid/cpp/src/qpid/broker/SelectorToken.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.28/qpid/cpp/src/qpid/broker/SelectorToken.cpp?rev=1584360&r1=1584359&r2=1584360&view=diff
==============================================================================
--- qpid/branches/0.28/qpid/cpp/src/qpid/broker/SelectorToken.cpp (original)
+++ qpid/branches/0.28/qpid/cpp/src/qpid/broker/SelectorToken.cpp Thu Apr  3 19:51:52 2014
@@ -147,6 +147,7 @@ inline bool isIdentifierPart(char c)
     return std::isalnum(c) || c=='_' || c=='$' || c=='.';
 }
 
+static const std::string END("<END>");
 bool tokenise(std::string::const_iterator& s, std::string::const_iterator& e, Token&
tok)
 {
     std::string::const_iterator t = s;
@@ -171,7 +172,7 @@ bool tokenise(std::string::const_iterato
     while (true)
     switch (state) {
     case START:
-        if (t==e) {tok = Token(T_EOS, s, "<END>"); return true;}
+        if (t==e) {tok = Token(T_EOS, s, END); return true;}
         else switch (*t) {
         case '(': tokType = T_LPAREN; state = ACCEPT_INC; continue;
         case ')': tokType = T_RPAREN; state = ACCEPT_INC; continue;

Modified: qpid/branches/0.28/qpid/cpp/src/qpid/sys/unordered_map.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.28/qpid/cpp/src/qpid/sys/unordered_map.h?rev=1584360&r1=1584359&r2=1584360&view=diff
==============================================================================
--- qpid/branches/0.28/qpid/cpp/src/qpid/sys/unordered_map.h (original)
+++ qpid/branches/0.28/qpid/cpp/src/qpid/sys/unordered_map.h Thu Apr  3 19:51:52 2014
@@ -21,7 +21,7 @@
 
 // unordered_map include path is platform specific
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
 #  include <unordered_map>
 #elif defined(__SUNPRO_CC)
 #  include <boost/tr1/unordered_map.hpp>
@@ -30,7 +30,11 @@
 #endif /* _MSC_VER */
 namespace qpid {
 namespace sys {
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+    using std::unordered_map;
+#else
     using std::tr1::unordered_map;
+#endif
 }}
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message