Fixes for re-enabling more MSVC level 4 warnings: misc edition #2

tools/json_to_struct/json_to_struct.py

 #!/usr/bin/env python
 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Format for the JSON schema file:
 # {
 #   "type_name": "DesiredCStructName",
 #   "headers": [          // Optional list of headers to be included by the .h.
 #     "path/to/header.h"
@@ skipping 81 matching lines @@
     namespace: A string corresponding to the C++ namespace to use.
     schema: A dict containing the schema. See comment at the top of this file.
     description: A dict containing the description. See comment at the top of
         this file.
   """
 
   h_filename = fileroot + '.h'
   with open(os.path.join(basepath, h_filename), 'w') as f:
     f.write(head)
 
-    f.write('#include <cstddef>\n')
-    f.write('\n')
-
     header_guard = _GenerateHeaderGuard(h_filename)
     f.write('#ifndef %s\n' % header_guard)
     f.write('#define %s\n' % header_guard)
     f.write('\n')
 
+    f.write('#include <cstddef>\n')
+    f.write('\n')

[Peter Kasting, 2014/07/09 22:19:54]

This just ensures the generated code puts all the #includes below the header
guard.

+
     for header in schema.get('headers', []):
       f.write('#include "%s"\n' % header)
     f.write('\n')
 
     if namespace:
       f.write('namespace %s {\n' % namespace)
       f.write('\n')
 
     f.write(struct_generator.GenerateStruct(
       schema['type_name'], schema['schema']))
@@ skipping 82 matching lines @@
     basepath = os.path.normpath(opts.destbase)
   else:
     basepath = ''
 
   schema = _Load(opts.schema)
   description = _Load(description_filename)
 
   head = HEAD % (datetime.now().year, opts.schema, description_filename)
   _GenerateH(basepath, output_root, head, opts.namespace, schema, description)
   _GenerateCC(basepath, output_root, head, opts.namespace, schema, description)