Merge branch 'master' of git.fangmeier.tech:caleb/filval

CMakeLists.txt

@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.8)
 
 PROJECT (FILVAL CXX)
 
-OPTION(BUILD_EXAMPLES "Build the demonstration programs" ON)
+OPTION(BUILD_EXAMPLES "Build the demonstration programs" OFF)
 
 SET(BUILD_SHARED_LIBS ON)
 ADD_SUBDIRECTORY(yaml-cpp)
@@ -25,10 +25,10 @@ INCLUDE_DIRECTORIES( SYSTEM ${ROOT_INCLUDE_DIR} include/ root/include/ yaml-cpp/
 # Adds the dictionary library for additonal type serialization
 
 
-SET( CLINGDICTFILE ${CMAKE_CURRENT_BINARY_DIR}/clingdict.cpp )
-ROOT_GENERATE_DICTIONARY( "" ${CMAKE_CURRENT_SOURCE_DIR}/root/include/LinkDef.hpp ${CLINGDICTFILE} "" )
+# SET( CLINGDICTFILE ${CMAKE_CURRENT_BINARY_DIR}/clingdict.cpp )
+# ROOT_GENERATE_DICTIONARY( "" ${CMAKE_CURRENT_SOURCE_DIR}/root/include/LinkDef.hpp ${CLINGDICTFILE} "" )
 
-ADD_LIBRARY( filval SHARED ${CLINGDICTFILE} )
+# ADD_LIBRARY( filval SHARED ${CLINGDICTFILE} )
 
 #SET(EXE_LIBS filval ${ROOT_LIBRARIES} ${PROJECT_BINARY_DIR}/libyaml-cpp.so)
 

include/container.hpp

@@ -44,7 +44,7 @@ template
 class std::vector<std::vector<int> >;
 
 
-namespace fv::util {
+namespace fv_util {
     std::string get_type_name(const std::type_index &index) {
         std::map<std::type_index, std::string> _map;
         // Add to this list as needed :)

root/include/root_container.hpp

@@ -60,7 +60,7 @@ namespace fv_root_util {
      * Saves an STL container into a ROOT file. ROOT knows how to serialize STL
      * containers, but it needs the *name* of the type of the container, eg.
      * std::map<int,int> to be able to do this. In order to generate this name at
-     * run-time, the fv::util::get_type_name function uses RTTI to get type info
+     * run-time, the fv_util::get_type_name function uses RTTI to get type info
      * and use it to look up the proper name.
      *
      * For nexted containers, it is necessary to generate the CLING dictionaries
@@ -245,7 +245,7 @@ namespace fv_root {
         }
 
         void save_as(const std::string &fname, const SaveOption &option = SaveOption::PNG) {
-            std::string type_name = "std::vector<" + fv::util::get_type_name(typeid(V)) + ">";
+            std::string type_name = "std::vector<" + fv_util::get_type_name(typeid(V)) + ">";
             fv_root_util::save_as_stl(this->get_container(), type_name, this->get_name(), option);
         }
     };
@@ -263,7 +263,7 @@ namespace fv_root {
         }
 
         void save_as(const std::string &fname, const SaveOption &option = SaveOption::PNG) {
-            std::string type_name = "std::map<" + fv::util::get_type_name(typeid(V)) + ",int>";
+            std::string type_name = "std::map<" + fv_util::get_type_name(typeid(V)) + ",int>";
             fv_root_util::save_as_stl(this->get_container(), type_name, this->get_name(), option);
         }