diff --git a/LCS/Common/include/Common/Exception.h b/LCS/Common/include/Common/Exception.h index 71f96da40ade55b0f34fb46c97b762cc242bbfb1..5f55e6d5a7cc9021f0159f43f1be890c996385db 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 cd19ffccf6ad0b362e600c1ce34899cfbfb223a6..e5730af3310318e4145971b0a2877ad2d0e3a84f 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 8c1cf1de7023e5399d4db683b261a28414f05392..26a815120031f96f2eea2bf402168bb3f8c8008f 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 6d9ce0ecba19ecc3bed4f4adb15aa37c6aaa7d82..8ec7bbfebe5927f76e052156e68902ee6c2c9cfc 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