From 4ef5b505e6105b9e4063a8839c750152fb57cff7 Mon Sep 17 00:00:00 2001
From: Marco De Marco <demarco@oats.inaf.it>
Date: Wed, 22 Jan 2014 12:45:06 +0100
Subject: [PATCH] Boost added to makefile, small fix
---
Makefile | 2 ++
src/FileWrapper.h | 2 +-
src/Session.h | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 66664c2..331d111 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ INSTALL_DIR=/usr/local/bin
INC_DIR=/usr/local/omniORB/include \
/usr/local/zeromq/include/zmq \
/usr/local/tango/include/tango \
+ /usr/local/boost/include \
/usr/local/soci/include \
/usr/local/soci/include/soci \
/usr/include/mysql \
@@ -15,6 +16,7 @@ INC_DIR=/usr/local/omniORB/include \
LIB_DIR=/usr/local/omniORB/lib \
/usr/local/zeromq/lib \
/usr/local/tango/lib \
+ /usr/local/boost/lib \
/usr/local/soci/lib64 \
/usr/local/protobuf/lib
#================================================================================
diff --git a/src/FileWrapper.h b/src/FileWrapper.h
index 35ffd9e..60b373c 100644
--- a/src/FileWrapper.h
+++ b/src/FileWrapper.h
@@ -62,7 +62,7 @@ protected:
std::ifstream m_inputFileStream;
//Read buffer size
- const boost::uint64_t BUFFER_SIZE = 1024;
+ static const boost::uint64_t BUFFER_SIZE = 1024;
};
} //End of namespace
diff --git a/src/Session.h b/src/Session.h
index 1ccae61..7d2c708 100644
--- a/src/Session.h
+++ b/src/Session.h
@@ -92,7 +92,7 @@ protected:
boost::asio::io_service::strand m_strand;
//Header size written on socket
- const unsigned int HEADER_SIZE = 4;
+ static const unsigned int HEADER_SIZE = 4;
//Binary buffer for read data
std::vector<boost::uint8_t> m_readBuff;
--
GitLab