Changeset 6052


Ignore:
Timestamp:
12/07/08 23:08:24 (5 years ago)
Author:
jdsiiro
Message:

Cleaning up the connection between interfaces and scolib so that scolib
solvers are registered in coliny if they are present.

Location:
interfaces/trunk
Files:
3 edited
2 moved

Legend:

Unmodified
Added
Removed
  • interfaces/trunk/interfaces/InterfacesRegistrations.h

    r5787 r6052  
    1010 */ 
    1111 
    12 #ifndef interfaces_ColinyRegistrations_h 
    13 #define interfaces_ColinyRegistrations_h 
     12#ifndef interfaces_InterfacesRegistrations_h 
     13#define interfaces_InterfacesRegistrations_h 
    1414 
    1515namespace interfaces { 
     
    1717namespace StaticInitializers { 
    1818 
    19 extern const volatile bool static_coliny_registrations; 
     19extern const volatile bool static_interfaces_registrations; 
    2020 
    2121} // namespace interfaces::StaticInitializers 
     
    2323 
    2424 
    25 #endif // interfaces_ColinyRegistrations_h 
     25#endif // interfaces_InterfacesRegistrations_h 
    2626 
  • interfaces/trunk/interfaces/Makefile.am

    r5802 r6052  
    2020OPTpp.h\ 
    2121TCC.h\ 
    22 ColinyRegistrations.h 
     22InterfacesRegistrations.h 
    2323 
    2424includeinterfacesdir=$(includedir)/interfaces 
  • interfaces/trunk/src/Makefile.am

    r5850 r6052  
    4242lib/OPTpp.cpp\ 
    4343lib/MOMHLib.cpp\ 
    44 lib/ColinyRegistrations.cpp 
     44lib/InterfacesRegistrations.cpp 
    4545 
    4646FOO= \ 
  • interfaces/trunk/src/exec/coliny.cpp

    r5787 r6052  
    1414// 
    1515 
    16 #include <interfaces/ColinyRegistrations.h> 
    1716#include <colin/ColinDriver.h> 
     17 
     18#ifdef ACRO_USING_SCOLIB 
     19#include <scolib/SCORegistrations.h> 
     20#endif 
     21 
     22#include <interfaces/InterfacesRegistrations.h> 
    1823 
    1924int main(int argc, char* argv[]) 
    2025{ 
    21 static_cast<void>(interfaces::StaticInitializers::static_coliny_registrations); 
    22 return colin::colin_driver(argc,argv,"coliny"); 
     26   // bring in (register) each of the interfaces from this package 
     27   static_cast<void> 
     28      (interfaces::StaticInitializers::static_interfaces_registrations); 
     29 
     30#ifdef ACRO_USING_SCOLIB 
     31   // bring in (register) the scolib package solvers, if they is present 
     32   static_cast<void>(scolib::StaticInitializers::static_scolib_registrations); 
     33#endif 
     34 
     35   return colin::colin_driver(argc, argv, "coliny"); 
    2336} 
  • interfaces/trunk/src/lib/InterfacesRegistrations.cpp

    r5802 r6052  
    1111 
    1212#include <acro_config.h> 
    13 #include <interfaces/ColinyRegistrations.h> 
     13#include <interfaces/InterfacesRegistrations.h> 
    1414 
    1515namespace interfaces { 
     
    6565 
    6666#ifdef ACRO_USING_DYNAMIC_LIBRARIES 
    67 const volatile bool static_coliny_registrations = false; 
     67const volatile bool static_interfaces_registrations = false; 
    6868#else 
    69 const volatile bool static_coliny_registrations = RegisterAll(); 
     69const volatile bool static_interfaces_registrations = RegisterAll(); 
    7070#endif 
    7171 
Note: See TracChangeset for help on using the changeset viewer.