mirror of
https://github.com/pocoproject/poco.git
synced 2025-10-14 15:05:35 +02:00
rename some of the new Environment methods, make PocoDoc config changes backwards-compatible, revert PocoDoc config changes, make doc build scripts work on macos
This commit is contained in:
@@ -30,28 +30,28 @@ class Foundation_API Environment
|
||||
{
|
||||
public:
|
||||
typedef UInt8 NodeId[6]; /// Ethernet address.
|
||||
|
||||
|
||||
static std::string get(const std::string& name);
|
||||
/// Returns the value of the environment variable
|
||||
/// with the given name. Throws a NotFoundException
|
||||
/// if the variable does not exist.
|
||||
|
||||
|
||||
static std::string get(const std::string& name, const std::string& defaultValue);
|
||||
/// Returns the value of the environment variable
|
||||
/// with the given name. If the environment variable
|
||||
/// is undefined, returns defaultValue instead.
|
||||
|
||||
|
||||
static bool has(const std::string& name);
|
||||
/// Returns true iff an environment variable
|
||||
/// with the given name is defined.
|
||||
|
||||
|
||||
static void set(const std::string& name, const std::string& value);
|
||||
/// Sets the environment variable with the given name
|
||||
/// to the given value.
|
||||
|
||||
static std::string osName();
|
||||
/// Returns the operating system name.
|
||||
|
||||
|
||||
static std::string osDisplayName();
|
||||
/// Returns the operating system name in a
|
||||
/// "user-friendly" way.
|
||||
@@ -61,33 +61,33 @@ public:
|
||||
/// "Windows XP" or "Windows 7/Server 2008 SP2".
|
||||
/// On other platforms, returns the same as
|
||||
/// osName().
|
||||
|
||||
|
||||
static std::string osVersion();
|
||||
/// Returns the operating system version.
|
||||
|
||||
|
||||
static std::string osArchitecture();
|
||||
/// Returns the operating system architecture.
|
||||
|
||||
|
||||
static std::string nodeName();
|
||||
/// Returns the node (or host) name.
|
||||
|
||||
|
||||
static void nodeId(NodeId& id);
|
||||
/// Returns the Ethernet address of the first Ethernet
|
||||
/// adapter found on the system.
|
||||
///
|
||||
/// Throws a SystemException if no Ethernet adapter is available.
|
||||
|
||||
|
||||
static std::string nodeId();
|
||||
/// Returns the Ethernet address (format "xx:xx:xx:xx:xx:xx")
|
||||
/// of the first Ethernet adapter found on the system.
|
||||
///
|
||||
/// Throws a SystemException if no Ethernet adapter is available.
|
||||
|
||||
|
||||
static unsigned processorCount();
|
||||
/// Returns the number of processors installed in the system.
|
||||
///
|
||||
/// If the number of processors cannot be determined, returns 1.
|
||||
|
||||
|
||||
static Poco::UInt32 libraryVersion();
|
||||
/// Returns the POCO C++ Libraries version as a hexadecimal
|
||||
/// number in format 0xAABBCCDD, where
|
||||
@@ -105,19 +105,15 @@ public:
|
||||
/// Return the operating system as defined
|
||||
/// in the include Foundation/Platform.h (POCO_OS)
|
||||
|
||||
static Poco::Int32 cpu();
|
||||
/// Return the underlying cpu that runs this operating system
|
||||
static Poco::Int32 arch();
|
||||
/// Return the underlying cpu architecture that runs this operating system
|
||||
/// as defined in Foundation/Platform (POCO_ARCH)
|
||||
|
||||
static bool osFamilyUnix();
|
||||
static bool isUnix();
|
||||
/// Return true if the operating system belongs to the Linux family
|
||||
|
||||
static bool osFamilyWindows();
|
||||
static bool isWindows();
|
||||
/// Return true if the operating system belongs to the Windows family
|
||||
|
||||
static bool osFamilyVms();
|
||||
/// Return true if the operating system belongs to the VMS family
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user