From 3a4de6194c8608f400ed6586afba2f7bd8f4d80b Mon Sep 17 00:00:00 2001
From: Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
Date: Fri, 24 Apr 2015 09:58:32 +0200
Subject: [PATCH] removed symlinks from repository because not all systems
 (hello windows) understand them

---
 amqpcpp                |  1 -
 src/amqpcpp            |  1 -
 src/includes.h         | 59 ++++++++++++++++++++++++++++++++++++++++--
 tests/myconnection.cpp |  4 +--
 4 files changed, 59 insertions(+), 6 deletions(-)
 delete mode 120000 amqpcpp
 delete mode 120000 src/amqpcpp

diff --git a/amqpcpp b/amqpcpp
deleted file mode 120000
index 2996fba..0000000
--- a/amqpcpp
+++ /dev/null
@@ -1 +0,0 @@
-include
\ No newline at end of file
diff --git a/src/amqpcpp b/src/amqpcpp
deleted file mode 120000
index f5030fe..0000000
--- a/src/amqpcpp
+++ /dev/null
@@ -1 +0,0 @@
-../include
\ No newline at end of file
diff --git a/src/includes.h b/src/includes.h
index 2a75192..89db1fa 100644
--- a/src/includes.h
+++ b/src/includes.h
@@ -7,8 +7,63 @@
  *  @documentation private
  */
 
-// include the generic amqp functions
-#include "../amqpcpp.h"
+// c and c++ dependencies
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <string>
+#include <set>
+#include <memory>
+#include <limits>
+#include <ostream>
+#include <math.h>
+#include <map>
+#include <vector>
+#include <queue>
+
+// forward declarations
+#include "../include/classes.h"
+
+// utility classes
+#include "../include/endian.h"
+#include "../include/buffer.h"
+#include "../include/bytebuffer.h"
+#include "../include/receivedframe.h"
+#include "../include/outbuffer.h"
+#include "../include/watchable.h"
+#include "../include/monitor.h"
+
+// amqp types
+#include "../include/field.h"
+#include "../include/numericfield.h"
+#include "../include/decimalfield.h"
+#include "../include/stringfield.h"
+#include "../include/booleanset.h"
+#include "../include/fieldproxy.h"
+#include "../include/table.h"
+#include "../include/array.h"
+
+// envelope for publishing and consuming
+#include "../include/metadata.h"
+#include "../include/envelope.h"
+#include "../include/message.h"
+
+// mid level includes
+#include "../include/exchangetype.h"
+#include "../include/flags.h"
+#include "../include/callbacks.h"
+#include "../include/deferred.h"
+#include "../include/deferredconsumer.h"
+#include "../include/deferredqueue.h"
+#include "../include/deferreddelete.h"
+#include "../include/deferredcancel.h"
+#include "../include/deferredget.h"
+#include "../include/channelimpl.h"
+#include "../include/channel.h"
+#include "../include/login.h"
+#include "../include/connectionhandler.h"
+#include "../include/connectionimpl.h"
+#include "../include/connection.h"
 
 // classes that are very commonly used
 #include "exception.h"
diff --git a/tests/myconnection.cpp b/tests/myconnection.cpp
index 50bbe2d..96f3580 100644
--- a/tests/myconnection.cpp
+++ b/tests/myconnection.cpp
@@ -76,7 +76,7 @@ void MyConnection::onConnected(Network::TcpSocket *socket)
     if (_connection) return;
     
     // create amqp connection, and a new channel
-    _connection = std::make_shared<AMQP::Connection>(this, AMQP::Login("guest1", "guest2"), "/");
+    _connection = std::make_shared<AMQP::Connection>(this, AMQP::Login("guest", "guest"), "/");
     _channel = std::make_shared<AMQP::Channel>(_connection.get());
     
     // install a handler when channel is in error
@@ -102,7 +102,7 @@ void MyConnection::onConnected(Network::TcpSocket *socket)
     });
 
     // declare an exchange
-    _channel->declareExchange("my_exchange", AMQP::direct).onSuccess([]() { 
+    _channel->declareExchange().onSuccess([]() { 
         std::cout << "exchange declared" << std::endl; 
     });