Use InstrSlots::NUM rather than pre-dividing by four. Also, mark this const.

[oota-llvm.git] / include / llvm / System / DynamicLibrary.h

diff --git a/include/llvm/System/DynamicLibrary.h b/include/llvm/System/DynamicLibrary.h
index fc1bfbe1fba62b9c87c744a2875ab87287b5eaf8..409a9d279c2dacbbed532d83a974513ce7e02670 100644 (file)
--- a/include/llvm/System/DynamicLibrary.h
+++ b/include/llvm/System/DynamicLibrary.h
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Reid Spencer and is distributed under the
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -15,7 +15,6 @@
 #define LLVM_SYSTEM_DYNAMIC_LIBRARY_H
 
 #include "llvm/System/Path.h"
-#include "llvm/System/IncludeFile.h"
 #include <string>
 
 namespace llvm {
@@ -30,33 +29,19 @@ namespace sys {
   /// It also allows for symbols to be defined which don't live in any library,
   /// but rather the main program itself, useful on Windows where the main
   /// executable cannot be searched.
-  /// @since 1.4
-  /// @brief Portable dynamic library abstraction.
   class DynamicLibrary {
     /// @name Constructors
     /// @{
     public:
       /// Construct a DynamicLibrary that represents the currently executing
       /// program. The program must have been linked with -export-dynamic or
-      /// -dlopen self for this to work. Any symbols retrieved with the
-      /// GetAddressOfSymbol function will refer to the program not to any
-      /// library.
+      /// -dlopen self for this to work. 
       /// @throws std::string indicating why the program couldn't be opened.
       /// @brief Open program as dynamic library.
       DynamicLibrary();
 
-      /// This is the constructor for DynamicLibrary instances. It will open
-      /// the dynamic library specified by the filename Path.
-      /// @throws std::string indicating why the library couldn't be opened.
-      /// @brief Open a dynamic library.
-      DynamicLibrary(const char* filename);
-
       /// After destruction, the symbols of the library will no longer be
-      /// available to the program. It is important to make sure the lifespan
-      /// of a DynamicLibrary exceeds the lifetime of the pointers returned
-      /// by the GetAddressOfSymbol otherwise the program may walk off into
-      /// uncharted territory.
-      /// @see GetAddressOfSymbol.
+      /// available to the program. 
       /// @brief Closes the DynamicLibrary
       ~DynamicLibrary();
 
@@ -97,27 +82,11 @@ namespace sys {
         AddSymbol(symbolName.c_str(), symbolValue);
       }
 
-    /// @}
-    /// @name Accessors
-    /// @{
-    public:
-      /// Looks up a \p symbolName in the DynamicLibrary and returns its address
-      /// if it exists. If the symbol does not exist, returns (void*)0.
-      /// @returns the address of the symbol or 0.
-      /// @brief Get the address of a symbol in the DynamicLibrary.
-      void* GetAddressOfSymbol(const char* symbolName);
-
-      /// @brief Convenience function for C++ophiles.
-      void* GetAddressOfSymbol(const std::string& symbolName) {
-        return GetAddressOfSymbol(symbolName.c_str());
-      }
-
     /// @}
     /// @name Implementation
     /// @{
     protected:
       void* handle;  // Opaque handle for information about the library
-
       DynamicLibrary(const DynamicLibrary&); ///< Do not implement
       DynamicLibrary& operator=(const DynamicLibrary&); ///< Do not implement
     /// @}
@@ -126,6 +95,4 @@ namespace sys {
 } // End sys namespace
 } // End llvm namespace
 
-FORCE_DEFINING_FILE_TO_BE_LINKED(SystemDynamicLibrary)
-
 #endif // LLVM_SYSTEM_DYNAMIC_LIBRARY_H