Merge from master

Changes

@@ -29,6 +29,8 @@ The contributors that suggested a given feature are shown in []. Thanks!
 
 ****  Fix to ignore Unicode UTF-8 BOM sequences, msg2576. [HyungKi Jeong]
 
+****  Fix std:: build error, bug1322.
+
 
 * Verilator 3.924 2018-06-12
 

src/V3Global.h

@@ -22,6 +22,10 @@
 #define _V3GLOBAL_H_ 1
 
 #include "config_build.h"
+#ifndef HAVE_CONFIG_BUILD
+# error "Something failed during ./configure as config_build.h is incomplete."
+#endif
+
 #include "verilatedos.h"
 #include <string>
 

src/VlcMain.cpp

@@ -19,6 +19,13 @@
 //*************************************************************************
 
 // Cheat for speed and compile .cpp files into one object
+#include "config_build.h"
+#ifndef HAVE_CONFIG_BUILD
+# error "Something failed during ./configure as config_build.h is incomplete."
+#endif
+
+#include "verilatedos.h"
+
 #define _V3ERROR_NO_GLOBAL_ 1
 #include "V3Error.cpp"
 #include "V3String.cpp"

src/config_build.h.in

@@ -84,3 +84,7 @@ using std::make_pair;
 //**** OS and compiler specifics
 
 #include "verilatedos.h"
+
+//**********************************************************************
+//**** This file sometimes gets truncated, so check in consumers
+#define HAVE_CONFIG_BUILD