commit 40f4cb17fff3caa04427ed404453d8046f026f08
author Austin Schuh <austin.linux@gmail.com> Sat Nov 28 13:33:22 2015 -0800
committer Gerrit Code Review <gerrit@robotics.mvla.net> Sat Nov 28 13:33:22 2015 -0800
tree b97c1c1a2ba4c00b2737120329a53165956f2e0f
parent bb36fd41aa91ada857a644e84ac73e0fd538dc75
parent 80758008bfa8c8f50959ae1affe9b26b52231813

Merge "Sandboxed controller codegen rules."

frc971/control_loops/python/control_loop.py

diff --git a/frc971/control_loops/python/control_loop.py b/frc971/control_loops/python/control_loop.py
index 53e388b..586a375 100644
--- a/frc971/control_loops/python/control_loop.py
+++ b/frc971/control_loops/python/control_loop.py
@@ -53,7 +53,7 @@
     return self._namespaces[0]
 
   def _HeaderGuard(self, header_file):
-    return ('_'.join([namespace.upper() for namespace in self._namespaces]) +
+    return ('_'.join([namespace.upper() for namespace in self._namespaces]) + '_' +
             os.path.basename(header_file).upper()
                 .replace('.', '_').replace('/', '_') + '_')
 

tools/build_rules/fortran.bzl

diff --git a/tools/build_rules/fortran.bzl b/tools/build_rules/fortran.bzl
index 635e7d7..ed586f7 100644
--- a/tools/build_rules/fortran.bzl
+++ b/tools/build_rules/fortran.bzl
@@ -3,7 +3,7 @@
       ctx.fragments.cpp.c_options +
       ctx.fragments.cpp.unfiltered_compiler_options([]) +
       ['-fPIC', '-Wno-maybe-uninitialized', '-Wno-unused-dummy-argument',
-       '-Wno-conversion', '-Wno-unused-variable'])
+       '-Wno-conversion', '-Wno-unused-variable', '-Wno-character-truncation'])
 
   cmd = toolchain_cflags + ['-c', ctx.file.src.path, '-o', ctx.outputs.pic_o.path]
   filtered_cmd = []