Add copy-constructor as required by C++11

[builder.git] / source / buildinfo.h

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 691ec549589889aeca464aab8be32c3c88892af0..fa8ae62d39606527509d7c9a8b8dd18d77db68e7 100644 (file)
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -21,6 +21,13 @@ public:
                FORCE_DYNAMIC  //< Only accept dynamic libraries
        };
 
+       enum RuntimePathMode
+       {
+               NO_RPATH,  //< Do not record rpath in binaries
+               RELATIVE,  //< Record relative rpath in binaries
+               ABSOLUTE   //< Record absolute rpath in binaries
+       };
+
        class Loader: public Msp::DataFile::ObjectLoader<BuildInfo>
        {
        public:
@@ -28,10 +35,12 @@ public:
        private:
                void incpath(const std::string &);
                void define(const std::string &, const std::string &);
+               void keep_symbol(const std::string &);
                void libmode_for_lib(const std::string &, LibraryMode);
                void libpath(const std::string &);
                void library(const std::string &);
                void local_incpath(const std::string &);
+               void standard(Msp::DataFile::Symbol, const std::string &);
                void sysroot(const std::string &);
        };
        
@@ -62,16 +71,18 @@ public:
        public:
                Tracked(): value(T()), set(false) { }
                Tracked(T v): value(v), set(false) { }
+               Tracked(const Tracked &t): value(t.value), set(t.set) { }
                Tracked &operator=(const Tracked &v) { if(v.set) { value = v.value; set = true; } return *this; }
 
-               Tracked &operator=(T v) { value = v; set = true; return *this; }
-               operator T() const { return value; }
+               Tracked &operator=(const T &v) { value = v; set = true; return *this; }
+               operator const T &() const { return value; }
        };
 
        typedef std::map<std::string, std::string> DefineMap;
        typedef std::list<Msp::FS::Path> PathList;
        typedef std::list<std::string> WordList;
        typedef std::map<std::string, LibraryMode> LibModeMap;
+       typedef std::map<std::string, std::string> StandardMap;
 
        Tracked<Msp::FS::Path> sysroot;
        DefineMap defines;
@@ -80,7 +91,10 @@ public:
        PathList libpath;
        WordList libs;
        Tracked<LibraryMode> libmode;
+       Tracked<RuntimePathMode> rpath_mode;
        LibModeMap libmodes;
+       WordList keep_symbols;
+       StandardMap standards;
        Tracked<bool> threads;
        Tracked<bool> debug;
        Tracked<int> optimize;