Fix for the most disruptive items in QPID-243.

* All #include lines now use '""' rather than '<>' where appropriate.
* #include lines within the qpid project use relative includes so that
  the same path will work in /usr/include when installed as part of the
  client libraries.
* All the source code has now been rearranged to be under src in a directory
  analogous to the namespace of the classes in it.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@524769 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 63 insertions, 0 deletions

diff --git a/cpp/src/broker/DeliveryRecord.h b/cpp/src/broker/DeliveryRecord.h
new file mode 100644
index 0000000000..15c207ce44
--- /dev/null
+++ b/cpp/src/broker/DeliveryRecord.h
@@ -0,0 +1,63 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#ifndef _DeliveryRecord_
+#define _DeliveryRecord_
+
+#include <algorithm>
+#include <list>
+#include "AccumulatedAck.h"
+#include "BrokerMessage.h"
+#include "Prefetch.h"
+#include "BrokerQueue.h"
+
+namespace qpid {
+    namespace broker {
+        class Channel;
+
+        /**
+         * Record of a delivery for which an ack is outstanding.
+         */
+        class DeliveryRecord{
+            mutable Message::shared_ptr msg;
+            mutable Queue::shared_ptr queue;
+            std::string consumerTag;
+            uint64_t deliveryTag;
+            bool pull;
+
+        public:
+            DeliveryRecord(Message::shared_ptr msg, Queue::shared_ptr queue, const std::string consumerTag, const uint64_t deliveryTag);
+            DeliveryRecord(Message::shared_ptr msg, Queue::shared_ptr queue, const uint64_t deliveryTag);
+            
+            void discard(TransactionContext* ctxt = 0) const;
+            bool matches(uint64_t tag) const;
+            bool coveredBy(const AccumulatedAck* const range) const;
+            void requeue() const;
+            void redeliver(Channel* const) const;
+            void addTo(Prefetch* const prefetch) const;
+            void subtractFrom(Prefetch* const prefetch) const;
+        };
+
+        typedef std::list<DeliveryRecord>::iterator ack_iterator; 
+    }
+}
+
+
+#endif