Thread: [Opal-commits] opal/src BlueprintManager.cpp,1.40,1.41 BlueprintManager.h,1.20,1.21 Defines.h,1.76,1
Status: Inactive
Brought to you by:
tylerstreeter
|
From: tylerstreeter <tyl...@us...> - 2005-04-19 14:20:48
|
Update of /cvsroot/opal/opal/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18173/src Modified Files: BlueprintManager.cpp BlueprintManager.h Defines.h Logger.cpp Logger.h Portability.h opal.h Log Message: added some comments to make the doxygen documentation look better Index: opal.h =================================================================== RCS file: /cvsroot/opal/opal/src/opal.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** opal.h 18 Apr 2005 22:21:04 -0000 1.27 --- opal.h 19 Apr 2005 14:20:36 -0000 1.28 *************** *** 74,85 **** { /// Creates a Simulator. ! OPAL_EXPORT_FUNCTION(Simulator*) createSimulator(); /// Loads a Blueprint from an OPAL XML file. ! OPAL_EXPORT_FUNCTION(void) loadFile(Blueprint& bp, const std::string& filename); /// Saves a Blueprint in an OPAL XML file. ! //OPAL_EXPORT_FUNCTION(void) saveFile(const Blueprint& bp, // const std::string& filename); } --- 74,85 ---- { /// Creates a Simulator. ! OPAL_EXPORT_FUNCTION Simulator* OPAL_CALL createSimulator(); /// Loads a Blueprint from an OPAL XML file. ! OPAL_EXPORT_FUNCTION void OPAL_CALL loadFile(Blueprint& bp, const std::string& filename); /// Saves a Blueprint in an OPAL XML file. ! //OPAL_EXPORT_FUNCTION void OPAL_CALL saveFile(const Blueprint& bp, // const std::string& filename); } Index: Defines.h =================================================================== RCS file: /cvsroot/opal/opal/src/Defines.h,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** Defines.h 14 Apr 2005 09:15:06 -0000 1.76 --- Defines.h 19 Apr 2005 14:20:35 -0000 1.77 *************** *** 44,48 **** #include "Logger.h" ! /// The main namespace that contains everything of OPAL. namespace opal { --- 44,48 ---- #include "Logger.h" ! /// The main namespace that contains everything in OPAL. namespace opal { *************** *** 305,308 **** --- 305,309 ---- } + /// Default parameters used in Shape creation. namespace shape { Index: Portability.h =================================================================== RCS file: /cvsroot/opal/opal/src/Portability.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Portability.h 18 Apr 2005 22:21:03 -0000 1.7 --- Portability.h 19 Apr 2005 14:20:36 -0000 1.8 *************** *** 52,62 **** /// Macro for exporting functions that keeps function names from being ! /// mangled and uses the correct calling convention. Note: All class ! /// methods for classes instantiated by OPAL (through factory creation ! /// calls) simply need to be virtual. Classes instantiated by the user ! /// should simply OPAL_DECL to export their public symbols. This doesn't ! /// allow extern "C" to be used to avoid name mangling of those class ! /// methods, but that probably isn't even possible...) ! #define OPAL_EXPORT_FUNCTION(returnType) extern "C" OPAL_DECL returnType OPAL_CALL // In Visual Studio, this is the only way to conditionally link with --- 52,62 ---- /// Macro for exporting functions that keeps function names from being ! /// mangled. Note: All class methods for classes instantiated by OPAL ! /// (through factory creation calls) simply need to be virtual. Classes ! /// instantiated by the user should simply OPAL_DECL to export their ! /// public symbols. This doesn't allow extern "C" to be used to avoid ! /// name mangling of those class methods, but that isn't possible. ! //#define OPAL_EXPORT_FUNCTION(returnType) extern "C" OPAL_DECL returnType OPAL_CALL ! #define OPAL_EXPORT_FUNCTION extern "C" OPAL_DECL // In Visual Studio, this is the only way to conditionally link with Index: BlueprintManager.h =================================================================== RCS file: /cvsroot/opal/opal/src/BlueprintManager.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** BlueprintManager.h 18 Apr 2005 22:21:03 -0000 1.20 --- BlueprintManager.h 19 Apr 2005 14:20:35 -0000 1.21 *************** *** 47,51 **** class VolumeSensorData; ! namespace blueprint_manager { class BlueprintManager --- 47,52 ---- class VolumeSensorData; ! /// A namespace for the BlueprintManager singleton implementation. ! namespace blueprintManagerImpl { class BlueprintManager *************** *** 180,184 **** }; } ! typedef Singleton<blueprint_manager::BlueprintManager> BlueprintManager; } --- 181,185 ---- }; } ! typedef Singleton<blueprintManagerImpl::BlueprintManager> BlueprintManager; } Index: BlueprintManager.cpp =================================================================== RCS file: /cvsroot/opal/opal/src/BlueprintManager.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** BlueprintManager.cpp 18 Apr 2005 22:21:03 -0000 1.40 --- BlueprintManager.cpp 19 Apr 2005 14:20:34 -0000 1.41 *************** *** 49,53 **** namespace opal { ! OPAL_EXPORT_FUNCTION(void) loadFile(Blueprint& bp, const std::string& filename) { --- 49,53 ---- namespace opal { ! OPAL_EXPORT_FUNCTION void OPAL_CALL loadFile(Blueprint& bp, const std::string& filename) { *************** *** 55,59 **** } ! namespace blueprint_manager { BlueprintManager::BlueprintManager() --- 55,59 ---- } ! namespace blueprintManagerImpl { BlueprintManager::BlueprintManager() Index: Logger.h =================================================================== RCS file: /cvsroot/opal/opal/src/Logger.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Logger.h 8 Mar 2005 16:10:23 -0000 1.4 --- Logger.h 19 Apr 2005 14:20:35 -0000 1.5 *************** *** 51,55 **** namespace opal { ! namespace logger { /// This class is used to log any events, errors, or warnings that may --- 51,56 ---- namespace opal { ! /// A namespace for the Logger singleton implementation. ! namespace loggerImpl { /// This class is used to log any events, errors, or warnings that may *************** *** 91,95 **** }; } ! typedef Singleton<logger::Logger> Logger; } --- 92,96 ---- }; } ! typedef Singleton<loggerImpl::Logger> Logger; } Index: Logger.cpp =================================================================== RCS file: /cvsroot/opal/opal/src/Logger.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Logger.cpp 18 Apr 2005 22:21:03 -0000 1.4 --- Logger.cpp 19 Apr 2005 14:20:35 -0000 1.5 *************** *** 4,8 **** namespace opal { ! namespace logger { Logger::Logger() --- 4,8 ---- namespace opal { ! namespace loggerImpl { Logger::Logger() |