Prepare for Eyescale/CMake#533

eile · Jan 18, 2017 · 44f8dbe · 44f8dbe
1 parent 96e502c
commit 44f8dbe
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/apps/morphologyConverter.cpp b/apps/morphologyConverter.cpp
@@ -1,10 +1,12 @@
 
-/* Copyright (c) 2015, EPFL/Blue Brain Project
- *                     Stefan.Eilemann@epfl.ch
+/* Copyright (c) 2015-2017, EPFL/Blue Brain Project
+ *                          Stefan.Eilemann@epfl.ch
  */
 
 #include <brion/brion.h>
 #include <lunchbox/clock.h>
+#include <lunchbox/file.h>
+#include <lunchbox/term.h>
 #include <boost/program_options.hpp>
 #include <boost/foreach.hpp>
 
@@ -13,7 +15,8 @@ using boost::lexical_cast;
 
 int main( int argc, char* argv[] )
 {
-    po::options_description options( "Options" );
+    po::options_description options( lunchbox::getFilename( argv[0] ),
+                                     lunchbox::term::getSize().first );
     options.add_options()
         ( "help,h", "Produce help message" )
         ( "version,v", "Show program name/version banner and exit" )

diff --git a/apps/spikeConverter.cpp b/apps/spikeConverter.cpp
@@ -20,6 +20,7 @@
 
 #include <brion/brion.h>
 #include <lunchbox/clock.h>
+#include <lunchbox/file.h>
 #include <lunchbox/log.h>
 #include <lunchbox/sleep.h>
 #include <lunchbox/string.h>
@@ -43,7 +44,8 @@ int main( int argc, char* argv[] )
         const auto uriHelp =
             lunchbox::string::prepend( brion::SpikeReport::getDescriptions(),
                                        "    " );
-        std::cerr << "Usage: " << argv[0] << " <inURI> <outURI>" << std::endl
+        std::cout << "Usage: " << lunchbox::getFilename( argv[0] )
+                  << " <inURI> <outURI>" << std::endl
                   << "  Supported input and output URIs:" << std::endl
                   << uriHelp << std::endl;
         return EXIT_FAILURE;

diff --git a/brion/compartmentReportPlugin.h b/brion/compartmentReportPlugin.h
@@ -128,7 +128,7 @@ class CompartmentReportPlugin : public boost::noncopyable
     virtual floatsPtr loadFrame( float timestamp ) const = 0;
 
     /** @copydoc brion::CompartmentReport::loadNeuron */
-    virtual floatsPtr loadNeuron( uint32_t ) const
+    virtual floatsPtr loadNeuron( uint32_t gid LB_UNUSED ) const
         { throw std::runtime_error( "loadNeuron() not implemented" ); }
 
     /** @copydoc brion::CompartmentReport::updateMapping */