From b0a2dee4e734a51a10a480cdc0db47b4280c816d Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Sun, 27 Sep 2015 21:05:19 +0000
Subject: [PATCH] Issue #8521: Also fixed test code that checked for
preprocessor variable HAVE_BOOST
---
LCS/Common/include/Common/Exception.h | 4 ----
LCS/Common/test/Coordinates.cc | 5 -----
LCS/Common/test/Shapes.cc | 5 -----
LCS/Common/test/tObjectFactory.cc | 13 -------------
4 files changed, 27 deletions(-)
diff --git a/LCS/Common/include/Common/Exception.h b/LCS/Common/include/Common/Exception.h
index 71f96da40ad..5f55e6d5a7c 100644
--- a/LCS/Common/include/Common/Exception.h
+++ b/LCS/Common/include/Common/Exception.h
@@ -31,11 +31,7 @@
#include <string>
#include <iosfwd>
-//#ifdef HAVE_BOOST
# include <boost/shared_ptr.hpp>
-//#else
-//# error "The Boost libraries are required. See http://www.boost.org/"
-//#endif
#ifdef HAVE_BACKTRACE
# include <Common/Backtrace.h>
diff --git a/LCS/Common/test/Coordinates.cc b/LCS/Common/test/Coordinates.cc
index cd19ffccf6a..e5730af3310 100644
--- a/LCS/Common/test/Coordinates.cc
+++ b/LCS/Common/test/Coordinates.cc
@@ -24,9 +24,6 @@
//# Always #include <lofar_config.h> first!
#include <lofar_config.h>
-//# This code can only be compiled if Boost is available.
-#ifdef HAVE_BOOST
-
//# Includes
#include "Coordinates.h"
#include <Common/lofar_iostream.h>
@@ -71,5 +68,3 @@ namespace LOFAR
}
}
-
-#endif
diff --git a/LCS/Common/test/Shapes.cc b/LCS/Common/test/Shapes.cc
index 8c1cf1de702..26a81512003 100644
--- a/LCS/Common/test/Shapes.cc
+++ b/LCS/Common/test/Shapes.cc
@@ -23,9 +23,6 @@
//# Always #include <lofar_config.h> first!
#include <lofar_config.h>
-//# This code can only be compiled if Boost is available.
-#ifdef HAVE_BOOST
-
//# Includes
#include "Shapes.h"
#include <Common/lofar_iostream.h>
@@ -73,5 +70,3 @@ namespace LOFAR
}
}
-
-#endif
diff --git a/LCS/Common/test/tObjectFactory.cc b/LCS/Common/test/tObjectFactory.cc
index 6d9ce0ecba1..8ec7bbfebe5 100644
--- a/LCS/Common/test/tObjectFactory.cc
+++ b/LCS/Common/test/tObjectFactory.cc
@@ -23,9 +23,6 @@
//# Always #include <lofar_config.h> first!
#include <lofar_config.h>
-//# This program can only be compiled if Boost is available.
-#ifdef HAVE_BOOST
-
//# Includes
#include "Shapes.h"
#include "Coordinates.h"
@@ -89,13 +86,3 @@ int main()
cout << endl;
return 0;
}
-
-#else
-
-int main()
-{
- // Test skipped.
- return 3;
-}
-
-#endif
--
GitLab