From c3fd27959f51e0469a7a6075e975f245ac306f3d Mon Sep 17 00:00:00 2001
From: Hans Johnson <hans-johnson@uiowa.edu>
Date: Thu, 29 Nov 2018 14:11:12 -0600
Subject: [PATCH] BUG:  Logic for conditional compilation was exactly wrong

---
 core/vsl/Templates/vsl_vector_io+int_64-.cxx | 2 +-
 core/vsl/vsl_binary_explicit_io.h            | 4 ++--
 core/vsl/vsl_binary_io.cxx                   | 2 +-
 core/vsl/vsl_binary_io.h                     | 2 +-
 core/vsl/vsl_block_binary.cxx                | 2 +-
 core/vsl/vsl_block_binary.h                  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/vsl/Templates/vsl_vector_io+int_64-.cxx b/core/vsl/Templates/vsl_vector_io+int_64-.cxx
index fcdafc0270..02c7a13c36 100644
--- a/core/vsl/Templates/vsl_vector_io+int_64-.cxx
+++ b/core/vsl/Templates/vsl_vector_io+int_64-.cxx
@@ -1,6 +1,6 @@
 #include <vxl_config.h>
 
-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
+#if VXL_INT_64_IS_LONGLONG
 #include <vsl/vsl_vector_io.hxx>
 VSL_VECTOR_IO_INSTANTIATE(vxl_int_64);
 
diff --git a/core/vsl/vsl_binary_explicit_io.h b/core/vsl/vsl_binary_explicit_io.h
index 9ff669fce0..49536d172c 100644
--- a/core/vsl/vsl_binary_explicit_io.h
+++ b/core/vsl/vsl_binary_explicit_io.h
@@ -141,7 +141,7 @@ macro (int);
 macro (unsigned int);
 macro (long);
 macro (unsigned long);
-#if VXL_HAS_INT_64 && ! ( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
+#if VXL_INT_64_IS_LONGLONG
 macro (vxl_int_64);
 macro (vxl_uint_64);
 #endif
@@ -486,7 +486,7 @@ inline std::size_t vsl_convert_from_arbitrary_length(const unsigned char* buffer
 
 /////////////////////////////////////////////////////////////////////////
 
-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
+#if VXL_INT_64_IS_LONGLONG
 
 //: Decode a buffer of arbitrary length integers
 // Converts from the integers from the arbitrary length format into
diff --git a/core/vsl/vsl_binary_io.cxx b/core/vsl/vsl_binary_io.cxx
index c36142bd41..9477642b0b 100644
--- a/core/vsl/vsl_binary_io.cxx
+++ b/core/vsl/vsl_binary_io.cxx
@@ -65,7 +65,7 @@ MACRO_MAKE_INTEGER_READ_WRITE(short);
 MACRO_MAKE_INTEGER_READ_WRITE(unsigned short);
 MACRO_MAKE_INTEGER_READ_WRITE(long);
 MACRO_MAKE_INTEGER_READ_WRITE(unsigned long);
-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG)
+#if VXL_INT_64_IS_LONGLONG
 MACRO_MAKE_INTEGER_READ_WRITE(vxl_int_64);
 MACRO_MAKE_INTEGER_READ_WRITE(vxl_uint_64);
 #endif
diff --git a/core/vsl/vsl_binary_io.h b/core/vsl/vsl_binary_io.h
index d38478aea5..9498f844c8 100644
--- a/core/vsl/vsl_binary_io.h
+++ b/core/vsl/vsl_binary_io.h
@@ -376,7 +376,7 @@ void vsl_b_read(vsl_b_istream& is,unsigned long& n );
 inline void vsl_print_summary(std::ostream& os, unsigned long n )
 {  os << n; }
 
-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
+#if VXL_INT_64_IS_LONGLONG
 
 //: Write  to vsl_b_ostream
 void vsl_b_write(vsl_b_ostream& os,vxl_int_64 n );
diff --git a/core/vsl/vsl_block_binary.cxx b/core/vsl/vsl_block_binary.cxx
index 017a651e99..c4220bebf6 100644
--- a/core/vsl/vsl_block_binary.cxx
+++ b/core/vsl/vsl_block_binary.cxx
@@ -285,7 +285,7 @@ template void vsl_block_binary_write_byte_impl(vsl_b_ostream &, const unsigned c
 template void vsl_block_binary_read_byte_impl(vsl_b_istream &, signed char*, std::size_t);
 template void vsl_block_binary_read_byte_impl(vsl_b_istream &, unsigned char*, std::size_t);
 
-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
+#if VXL_INT_64_IS_LONGLONG
 template void vsl_block_binary_write_int_impl(vsl_b_ostream &, const vxl_int_64*, std::size_t);
 template void vsl_block_binary_write_int_impl(vsl_b_ostream &, const vxl_uint_64*, std::size_t);
 template void vsl_block_binary_read_int_impl(vsl_b_istream &, vxl_int_64*, std::size_t);
diff --git a/core/vsl/vsl_block_binary.h b/core/vsl/vsl_block_binary.h
index 014bb8d055..2ceafb0186 100644
--- a/core/vsl/vsl_block_binary.h
+++ b/core/vsl/vsl_block_binary.h
@@ -218,7 +218,7 @@ inline void vsl_block_binary_read(vsl_b_istream &is, unsigned long* begin, std::
 }
 
 /////////////////////////////////////////////////////////////////////////
-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
+#if VXL_INT_64_IS_LONGLONG
 
 //: Write a block of signed longs to a vsl_b_ostream
 // This function is very speed efficient, but
-- 
2.21.0