[geos-commits] [SCM] GEOS branch master updated. f111980ebc69dcfa961400ae6238a7924c800d68

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  f111980ebc69dcfa961400ae6238a7924c800d68 (commit)
       via  4101c6142203aa80f7b6abb6349e13e82e39dc1c (commit)
      from  02d67f53b479a07e8488d9ad8a51012902e5ae66 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f111980ebc69dcfa961400ae6238a7924c800d68
Merge: 02d67f5 4101c61
Author: Kurt Schwehr <schwehr at google.com>
Date:   Wed Jun 27 11:04:30 2018 -0700

    Merge branch 'byteordervalues-b74945003-863' of goatbar/geos into master


commit 4101c6142203aa80f7b6abb6349e13e82e39dc1c
Author: Kurt Schwehr <schwehr at google.com>
Date:   Mon Jun 11 12:29:31 2018 -0700

    Fix building with DEBUG_BYTEORDER_VALUES=1 in ByteOrderValues.cpp
    
    Add missing includes and missing std::
    
    Fixes #863

diff --git a/src/io/ByteOrderValues.cpp b/src/io/ByteOrderValues.cpp
index d0a266b..08e9129 100644
--- a/src/io/ByteOrderValues.cpp
+++ b/src/io/ByteOrderValues.cpp
@@ -23,6 +23,11 @@
 #include <cstring>
 #include <cassert>
 
+#if DEBUG_BYTEORDER_VALUES
+#include <ios>
+#include <iostream>
+#endif
+
 namespace geos {
 namespace io { // geos.io
 
@@ -143,12 +148,12 @@ ByteOrderValues::putDouble(double doubleValue, unsigned char *buf, int byteOrder
 	int64 longValue;
     std::memcpy(&longValue, &doubleValue, sizeof(double));
 #if DEBUG_BYTEORDER_VALUES
-	cout<<"ByteOrderValues::putDouble("<<doubleValue<<
+	std::cout<<"ByteOrderValues::putDouble("<<doubleValue<<
 		", order:"<<byteOrder
-		<<") = "<<hex;
+		<<") = "<<std::hex;
 	for (int i=0; i<8; i++)
-		cout<<"["<<(int)buf[i]<<"]";
-	cout<<dec<<endl;
+		std::cout<<"["<<(int)buf[i]<<"]";
+	std::cout<<std::dec<<std::endl;
 #endif
 	putLong(longValue, buf, byteOrder);
 }

-----------------------------------------------------------------------

Summary of changes:
 src/io/ByteOrderValues.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GEOS