[176-update-to-sysrepo-0-7-6-release] Changet HAVE_OLD_SYSREPO into HAVE_PRE_0_7_6_SY...

diff --git a/configure.ac b/configure.ac
index 8d40afc453829eab224addaaaa8598dac856811c..bc4f068ef5f5b72339ebd041f828ac7b6159bf55 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -950,7 +950,7 @@ if test "$SYSREPO_CONFIG" != "" ; then
                 [#include <sysrepo-cpp/Session.h>],
                 [Connection("conn-name");])],
             [AC_MSG_RESULT([checking for Sysrepo C++ bindings headers and library... old])
-             AC_DEFINE([HAVE_OLD_SYSREPO], [1], [Using sysrepo < 0.7.6])],
+             AC_DEFINE([HAVE_HAVE_PRE_0_7_6_SYSREPO], [1], [Using sysrepo < 0.7.6])],
              [AC_MSG_RESULT([checking for Sysrepo C++ bindings headers and library... no])
               AC_MSG_ERROR([Needs Sysrepo C++ bindings (unable to find Sysrepo-ccp library. To get it, you need to compile sysrepo with -DGEN_CPP_BINDINGS=ON.)])]
         )]

diff --git a/src/bin/netconf/netconf.cc b/src/bin/netconf/netconf.cc
index 4f2276fa6b48a29a02f28e1953fa21cda7343b63..4f60d208f6d1c6c20d7162583574ebba43ea6fe1 100644 (file)
--- a/src/bin/netconf/netconf.cc
+++ b/src/bin/netconf/netconf.cc
@@ -22,7 +22,7 @@ using namespace isc::config;
 using namespace isc::data;
 using namespace isc::netconf;
 using namespace isc::yang;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/bin/netconf/netconf.h b/src/bin/netconf/netconf.h
index 9778726b0c2e91735d1b10c8cbd8d9c1468c2e91..cd02c6c8932a8d99ccdc1dfdf2231b7f93ea40fe 100644 (file)
--- a/src/bin/netconf/netconf.h
+++ b/src/bin/netconf/netconf.h
@@ -18,7 +18,7 @@
 #include <netconf/http_control_socket.h>
 #include <netconf/stdout_control_socket.h>
 #include <netconf/unix_control_socket.h>
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 #include <sysrepo-cpp/Session.hpp>
 #else
 #include <sysrepo-cpp/Session.h>
@@ -79,7 +79,7 @@ public:
     /// @param sess The sysrepo running datastore session.
     /// @param service_pair The service name and configuration pair.
     /// @return return code for sysrepo.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     static int validate(sysrepo::S_Session sess,
                         const CfgServersMapPair& service_pair);
 #else
@@ -93,7 +93,7 @@ public:
     /// @param sess The sysrepo running datastore session.
     /// @param service_pair The service name and configuration pair.
     /// @return return code for sysrepo.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     static int update(sysrepo::S_Session sess,
                       const CfgServersMapPair& service_pair);
 #else
@@ -108,7 +108,7 @@ public:
     ///
     /// @param sess The sysrepo running datastore session.
     /// @param model The model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     static void logChanges(sysrepo::S_Session sess, const std::string& model);
 #else
     static void logChanges(S_Session sess, const std::string& model);
@@ -146,28 +146,28 @@ protected:
     void subscribeConfig(const CfgServersMapPair& service_pair);
 
     /// @brief Sysrepo connection.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     sysrepo::S_Connection conn_;
 #else
     S_Connection conn_;
 #endif
 
     /// @brief Sysrepo startup datastore session.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     sysrepo::S_Session startup_sess_;
 #else
     S_Session startup_sess_;
 #endif
 
     /// @brief Sysrepo running datastore session.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     sysrepo::S_Session running_sess_;
 #else
     S_Session running_sess_;
 #endif
 
     /// @brief Subscription map.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     std::map<const std::string, sysrepo::S_Subscribe> subscriptions_;
 #else
     std::map<const std::string, S_Subscribe> subscriptions_;

diff --git a/src/bin/netconf/tests/netconf_unittests.cc b/src/bin/netconf/tests/netconf_unittests.cc
index 9fc97698fb401b098fc90c07f093e280dd5d5669..0e647c8d1921879c842bc26780a4a6c86283e4c3 100644 (file)
--- a/src/bin/netconf/tests/netconf_unittests.cc
+++ b/src/bin/netconf/tests/netconf_unittests.cc
@@ -34,7 +34,7 @@ using namespace isc::test;
 using namespace isc::yang;
 using namespace isc::yang::test;
 using namespace isc::util::thread;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/pretests/sysrepo_setup_tests.cc b/src/lib/yang/pretests/sysrepo_setup_tests.cc
index 98b7aa87f3b8d10d2c788c71d6ddbd8a006f736d..d1ea67662250e55bf7e168a7816bcc0919e2dad3 100644 (file)
--- a/src/lib/yang/pretests/sysrepo_setup_tests.cc
+++ b/src/lib/yang/pretests/sysrepo_setup_tests.cc
@@ -6,7 +6,7 @@
 
 #include <config.h>
 
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 #include <sysrepo-cpp/Session.hpp>
 #else
 #include <sysrepo-cpp/Session.h>
@@ -15,7 +15,7 @@
 #include <sstream>
 
 using namespace std;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/tests/config_unittests.cc b/src/lib/yang/tests/config_unittests.cc
index cb4b083a321d923c701b31d8d1e39578dc300fdd..09879872238edd0275163a5a986b91a35ec5f423 100644 (file)
--- a/src/lib/yang/tests/config_unittests.cc
+++ b/src/lib/yang/tests/config_unittests.cc
@@ -21,7 +21,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/tests/sysrepo_setup.h b/src/lib/yang/tests/sysrepo_setup.h
index c9e270ebeb65320d267787f7cedc422c60a4498f..855431f4118a024aa1ab38135240f7496b6d4f8d 100644 (file)
--- a/src/lib/yang/tests/sysrepo_setup.h
+++ b/src/lib/yang/tests/sysrepo_setup.h
@@ -36,7 +36,7 @@ public:
     void useModel(std::string model) {
         std::string full_name =
             "translator " + std::string(Name) + " unittests";
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
         conn_.reset(new sysrepo::Connection(full_name.c_str()));
         sess_.reset(new sysrepo::Session(conn_, SR_DS_CANDIDATE));
 #else
@@ -56,14 +56,14 @@ public:
     }
 
     /// @brief Sysrepo connection.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     sysrepo::S_Connection conn_;
 #else
     S_Connection conn_;
 #endif
 
     /// @brief Sysrepo session.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     sysrepo::S_Session sess_;
 #else
     S_Session sess_;

diff --git a/src/lib/yang/tests/translator_class_unittests.cc b/src/lib/yang/tests/translator_class_unittests.cc
index 1eefe0138f016a22f6ef55624841cce008d4323a..e299835b57965385bdc9b795a606fda30f717a9a 100644 (file)
--- a/src/lib/yang/tests/translator_class_unittests.cc
+++ b/src/lib/yang/tests/translator_class_unittests.cc
@@ -18,7 +18,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/tests/translator_control_socket_unittests.cc b/src/lib/yang/tests/translator_control_socket_unittests.cc
index c6a3e69cfb36e7789e8ee7f6590deea788d33cf5..5ceef861b4dcb6a93765cd29d890b6b85e26e545 100644 (file)
--- a/src/lib/yang/tests/translator_control_socket_unittests.cc
+++ b/src/lib/yang/tests/translator_control_socket_unittests.cc
@@ -17,7 +17,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/tests/translator_database_unittests.cc b/src/lib/yang/tests/translator_database_unittests.cc
index d891b54417a383195affcc185d65d340917041e1..6c5e552da518af12042f9f3d14223ea8475ea469 100644 (file)
--- a/src/lib/yang/tests/translator_database_unittests.cc
+++ b/src/lib/yang/tests/translator_database_unittests.cc
@@ -17,7 +17,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/tests/translator_host_unittests.cc b/src/lib/yang/tests/translator_host_unittests.cc
index e387587550dfeff1bfa047607129af9ee7c3bfb9..4abc8dd7fec6525095ed62ba37a78777d598d5c1 100644 (file)
--- a/src/lib/yang/tests/translator_host_unittests.cc
+++ b/src/lib/yang/tests/translator_host_unittests.cc
@@ -18,7 +18,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/tests/translator_logger_unittests.cc b/src/lib/yang/tests/translator_logger_unittests.cc
index 6dce09b576f937621136345d85a5cb287ed2bcd8..a8bc744137e0160e818b8c19bfac11d253cf0259 100644 (file)
--- a/src/lib/yang/tests/translator_logger_unittests.cc
+++ b/src/lib/yang/tests/translator_logger_unittests.cc
@@ -17,7 +17,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/tests/translator_option_data_unittests.cc b/src/lib/yang/tests/translator_option_data_unittests.cc
index 5aa0d3216e1409056a781af0c78533be32a52424..7067b0fbb012950049dfa24ceeba910205898447 100644 (file)
--- a/src/lib/yang/tests/translator_option_data_unittests.cc
+++ b/src/lib/yang/tests/translator_option_data_unittests.cc
@@ -18,7 +18,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/tests/translator_option_def_unittests.cc b/src/lib/yang/tests/translator_option_def_unittests.cc
index 2baec9ae36ebb51ea7ab16ec343dc27db95010f1..6daab7449305f96ce650542ac692a9cee2d9e915 100644 (file)
--- a/src/lib/yang/tests/translator_option_def_unittests.cc
+++ b/src/lib/yang/tests/translator_option_def_unittests.cc
@@ -18,7 +18,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/tests/translator_pd_pool_unittests.cc b/src/lib/yang/tests/translator_pd_pool_unittests.cc
index f9e30b63d5bc891fd8dd41f868edbfc4384b450f..cb9ad3e030e795262f6215c13cc1295bdb72cb95 100644 (file)
--- a/src/lib/yang/tests/translator_pd_pool_unittests.cc
+++ b/src/lib/yang/tests/translator_pd_pool_unittests.cc
@@ -18,7 +18,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/tests/translator_pool_unittests.cc b/src/lib/yang/tests/translator_pool_unittests.cc
index c8ed80c1aa461182ec17ceba87cc2ec1bbd06dfc..998bf506577a0c608033e5665bb71832bca2f459 100644 (file)
--- a/src/lib/yang/tests/translator_pool_unittests.cc
+++ b/src/lib/yang/tests/translator_pool_unittests.cc
@@ -18,7 +18,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/tests/translator_shared_network_unittests.cc b/src/lib/yang/tests/translator_shared_network_unittests.cc
index b18510d08a084bf8391c840652251769eea8be69..58b44562bf2e165ac176cb4fcd79a98f6ddb445d 100644 (file)
--- a/src/lib/yang/tests/translator_shared_network_unittests.cc
+++ b/src/lib/yang/tests/translator_shared_network_unittests.cc
@@ -17,7 +17,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/tests/translator_subnet_unittests.cc b/src/lib/yang/tests/translator_subnet_unittests.cc
index 5b33d28ad614b5a67575af40aa5ebb82e5b976d0..d3adf2f3dbc83d93c28fb25cbefce1ac3d032058 100644 (file)
--- a/src/lib/yang/tests/translator_subnet_unittests.cc
+++ b/src/lib/yang/tests/translator_subnet_unittests.cc
@@ -17,7 +17,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/tests/translator_unittests.cc b/src/lib/yang/tests/translator_unittests.cc
index 515c28c94c986e5cebded9bf61409c30966db4a2..a93e963e713fc5d4dae90c269877dfd85ef3633f 100644 (file)
--- a/src/lib/yang/tests/translator_unittests.cc
+++ b/src/lib/yang/tests/translator_unittests.cc
@@ -15,7 +15,7 @@ using namespace std;
 using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/tests/translator_utils_unittests.cc b/src/lib/yang/tests/translator_utils_unittests.cc
index 79845c29ce2d881f3abad0b7b59415975c7b1be9..d99dc1e3850c72f5fb2f0104a04fbc3b03227188 100644 (file)
--- a/src/lib/yang/tests/translator_utils_unittests.cc
+++ b/src/lib/yang/tests/translator_utils_unittests.cc
@@ -15,7 +15,7 @@ using namespace std;
 using namespace isc;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/testutils/translator_test.cc b/src/lib/yang/testutils/translator_test.cc
index f21146bbaf14ec708df27b376608b62fa60b7a02..bf542ccb6b5573b92b5b5496bec3f5661c64c076 100644 (file)
--- a/src/lib/yang/testutils/translator_test.cc
+++ b/src/lib/yang/testutils/translator_test.cc
@@ -12,7 +12,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/testutils/translator_test.h b/src/lib/yang/testutils/translator_test.h
index 1ead1da05bf122fa7fa6b4910194a37bb8fd6fe4..4fc829962090922271f6bd1d80e63fe468b60986 100644 (file)
--- a/src/lib/yang/testutils/translator_test.h
+++ b/src/lib/yang/testutils/translator_test.h
@@ -46,7 +46,7 @@ public:
         /// @param xpath The xpath of an element to be retrieved.
         /// @param session Sysrepo session.
         /// @return YangReprItem instance representing configuration parameter.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
         static YangReprItem get(const std::string& xpath,
                                 sysrepo::S_Session session);
 #else
@@ -90,7 +90,7 @@ public:
     /// @brief Get tree from session.
     ///
     /// @param session Sysrepo session.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     Tree get(sysrepo::S_Session session) const;
 #else
     Tree get(S_Session session) const;
@@ -103,7 +103,7 @@ public:
     /// @param errs Error stream.
     /// @return true if verification succeeds, false with errors displayed.
     /// on errs if it fails.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     bool verify(const Tree& expected, sysrepo::S_Session session,
                 std::ostream& errs) const;
 #else
@@ -117,7 +117,7 @@ public:
     ///
     /// @param tree The tree to install.
     /// @param session Sysrepo session.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     void set(const Tree& tree, sysrepo::S_Session session) const;
 #else
     void set(const Tree& tree, S_Session session) const;
@@ -129,7 +129,7 @@ public:
     /// @param errs Error stream.
     /// @return True if validation succeeds, false with errors displayed
     /// on errs if it fails.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     bool validate(sysrepo::S_Session session, std::ostream& errs) const;
 #else
     bool validate(S_Session session, std::ostream& errs) const;

diff --git a/src/lib/yang/translator.cc b/src/lib/yang/translator.cc
index 783b47daaea9576146d2a5bb9b9c70c510cbdccc..834218b915570ee1c27643822a237f1cc53b0e72 100644 (file)
--- a/src/lib/yang/translator.cc
+++ b/src/lib/yang/translator.cc
@@ -13,7 +13,7 @@
 using namespace std;
 using namespace isc::data;
 using namespace isc::util::encode;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/translator.h b/src/lib/yang/translator.h
index 227939a3e11420e2d67051bb9375eb0ad5a029fa..5c3313e42453efad37547139623e5cc0df99a194 100644 (file)
--- a/src/lib/yang/translator.h
+++ b/src/lib/yang/translator.h
@@ -14,7 +14,7 @@
 #error "config.h must be included before translator.h"
 #endif
 
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 #include <sysrepo-cpp/Session.hpp>
 #else
 #include <sysrepo-cpp/Session.h>
@@ -31,7 +31,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name (used and shared by derived classes).
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorBasic(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorBasic(S_Session session, const std::string& model);
@@ -47,7 +47,7 @@ public:
     /// @param s_val The value.
     /// @return The Element representing the sysrepo value.
     /// @throw NotImplemented when the value type is not supported.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     static isc::data::ElementPtr value(sysrepo::S_Val s_val);
 #else
     static isc::data::ElementPtr value(S_Val s_val);
@@ -77,7 +77,7 @@ public:
     ///
     /// @param elem The JSON element.
     /// @param type The sysrepo type.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     static sysrepo::S_Val value(isc::data::ConstElementPtr elem,
                                 sr_type_t type);
 #else
@@ -103,7 +103,7 @@ public:
     ///
     /// @param xpath The xpath of the list.
     /// @return An S_Iter_Value pointer. Null is the list does not exist.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     sysrepo::S_Iter_Value getIter(const std::string& xpath);
 #else
     S_Iter_Value getIter(const std::string& xpath);
@@ -114,7 +114,7 @@ public:
     /// @param iter The iterator pointing to the previous element
     /// @return The xpath of the next element. Empty string when at
     /// the end of the list.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     std::string getNext(sysrepo::S_Iter_Value iter);
 #else
     std::string getNext(S_Iter_Value iter);
@@ -122,7 +122,7 @@ public:
 
 protected:
     /// @brief The sysrepo session.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     sysrepo::S_Session session_;
 #else
     S_Session session_;

diff --git a/src/lib/yang/translator_class.cc b/src/lib/yang/translator_class.cc
index 199e23b8897bc9e80de4196461d761fe441672cc..5774a794b423ca3cfb54943a3e01a6db44ebfe7a 100644 (file)
--- a/src/lib/yang/translator_class.cc
+++ b/src/lib/yang/translator_class.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/translator_class.h b/src/lib/yang/translator_class.h
index 545420fdb8363ffae3fd1b92bb87524164f146ef..15de324531dffdf3f3857ac0fb73a4407ae5cbba 100644 (file)
--- a/src/lib/yang/translator_class.h
+++ b/src/lib/yang/translator_class.h
@@ -82,7 +82,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorClass(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorClass(S_Session session, const std::string& model);
@@ -132,7 +132,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorClasses(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorClasses(S_Session session, const std::string& model);

diff --git a/src/lib/yang/translator_config.cc b/src/lib/yang/translator_config.cc
index 969a312046ebdf037c8333a5bd29d3cb2f100811..1818287d11e880f0542b73f5b079421a3c45135d 100644 (file)
--- a/src/lib/yang/translator_config.cc
+++ b/src/lib/yang/translator_config.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/translator_config.h b/src/lib/yang/translator_config.h
index fd9bf33a5381c0247f13107b0d01c3130fa07674..ead115f006631a4638a4bc485dbdafc6d124bf9a 100644 (file)
--- a/src/lib/yang/translator_config.h
+++ b/src/lib/yang/translator_config.h
@@ -394,7 +394,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorConfig(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorConfig(S_Session session, const std::string& model);

diff --git a/src/lib/yang/translator_control_socket.cc b/src/lib/yang/translator_control_socket.cc
index 64e72a0b127549c9f1b5a55bdd6a6bd11ca5c172..65757e583e6d09d8df7dacf550e3d1f79bccda46 100644 (file)
--- a/src/lib/yang/translator_control_socket.cc
+++ b/src/lib/yang/translator_control_socket.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/translator_control_socket.h b/src/lib/yang/translator_control_socket.h
index 3254869470cc4ebca70a5d936a00d7b634cb7f23..0ee964af657fce19e45f0fb5c4bd0703e11a6585 100644 (file)
--- a/src/lib/yang/translator_control_socket.h
+++ b/src/lib/yang/translator_control_socket.h
@@ -74,7 +74,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorControlSocket(sysrepo::S_Session session,
                             const std::string& model);
 #else

diff --git a/src/lib/yang/translator_database.cc b/src/lib/yang/translator_database.cc
index d103ccdf2c5dfbe62177f6373c2c3e0a76d9c661..5d30503f9d535f64df7838456ac9490cbb4bc2e5 100644 (file)
--- a/src/lib/yang/translator_database.cc
+++ b/src/lib/yang/translator_database.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/translator_database.h b/src/lib/yang/translator_database.h
index dfcc5293b7e29a452e5626a10dbe4ecf7cf1caa6..fd6573f320c6040436e12cc2bac520b4d697ea53 100644 (file)
--- a/src/lib/yang/translator_database.h
+++ b/src/lib/yang/translator_database.h
@@ -109,7 +109,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorDatabase(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorDatabase(S_Session session, const std::string& model);
@@ -166,7 +166,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorDatabases(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorDatabases(S_Session session, const std::string& model);

diff --git a/src/lib/yang/translator_host.cc b/src/lib/yang/translator_host.cc
index db3e42ce3df921096c644d2e314bbf64cb9cf55d..4c4a0ad34f0f146cae210d33f9e367939759d43f 100644 (file)
--- a/src/lib/yang/translator_host.cc
+++ b/src/lib/yang/translator_host.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/translator_host.h b/src/lib/yang/translator_host.h
index f19372308214ba687998324abe46746cd14516d1..e1f611546510b72617189e99871685a2bf69952a 100644 (file)
--- a/src/lib/yang/translator_host.h
+++ b/src/lib/yang/translator_host.h
@@ -119,7 +119,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorHost(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorHost(S_Session session, const std::string& model);
@@ -170,7 +170,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorHosts(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorHosts(S_Session session, const std::string& model);

diff --git a/src/lib/yang/translator_logger.cc b/src/lib/yang/translator_logger.cc
index f00d20ecf9e25b1ee8246ee33e85d746afcf5e03..c61d55fc01cf4e95254a79c180dafba8dfcc8e10 100644 (file)
--- a/src/lib/yang/translator_logger.cc
+++ b/src/lib/yang/translator_logger.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/translator_logger.h b/src/lib/yang/translator_logger.h
index 2b5bc2d34d1d0e6c282e2826c92a1b440030619a..1b33e5e59663362d25f67f59babc04e74f75fd55 100644 (file)
--- a/src/lib/yang/translator_logger.h
+++ b/src/lib/yang/translator_logger.h
@@ -101,7 +101,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorLogger(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorLogger(S_Session session, const std::string& model);
@@ -179,7 +179,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorLoggers(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorLoggers(S_Session session, const std::string& model);

diff --git a/src/lib/yang/translator_option_data.cc b/src/lib/yang/translator_option_data.cc
index f05fe28a94750bf2368ca15642d58493cf3b83e2..0fb64f445a29fa1462a3611882984cff5b17665e 100644 (file)
--- a/src/lib/yang/translator_option_data.cc
+++ b/src/lib/yang/translator_option_data.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/translator_option_data.h b/src/lib/yang/translator_option_data.h
index 74a9439403851fce0f234ce6d1881d35df0bff82..eeb104d3cc4c3b2c63ae28ef82cb69de78b17d49 100644 (file)
--- a/src/lib/yang/translator_option_data.h
+++ b/src/lib/yang/translator_option_data.h
@@ -80,7 +80,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorOptionData(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorOptionData(S_Session session, const std::string& model);
@@ -131,7 +131,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorOptionDataList(sysrepo::S_Session session,
                              const std::string& model);
 #else

diff --git a/src/lib/yang/translator_option_def.cc b/src/lib/yang/translator_option_def.cc
index 88a784ef1a91158ac86419963c9b81aedaf8887a..83a62febb03150ae96ae18c62a77660ccaab59b1 100644 (file)
--- a/src/lib/yang/translator_option_def.cc
+++ b/src/lib/yang/translator_option_def.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/translator_option_def.h b/src/lib/yang/translator_option_def.h
index 4987be325fff96a3c2c78c37bf519f78eec9a543..73eb0229cf2d83c4dcbdd323678fdf51d379063f 100644 (file)
--- a/src/lib/yang/translator_option_def.h
+++ b/src/lib/yang/translator_option_def.h
@@ -83,7 +83,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorOptionDef(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorOptionDef(S_Session session, const std::string& model);
@@ -136,7 +136,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorOptionDefList(sysrepo::S_Session session,
                             const std::string& model);
 #else

diff --git a/src/lib/yang/translator_pd_pool.cc b/src/lib/yang/translator_pd_pool.cc
index 7638b51898829bf781ea9aab5732ecca7354b860..a93568a324155065ec7e767b0ba499183bc13761 100644 (file)
--- a/src/lib/yang/translator_pd_pool.cc
+++ b/src/lib/yang/translator_pd_pool.cc
@@ -14,7 +14,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/translator_pd_pool.h b/src/lib/yang/translator_pd_pool.h
index 05e2019ab56736865b4cc7f44606dced867bbaad..353049e3e6dccf728d48dd79bbac941e37cd4d6e 100644 (file)
--- a/src/lib/yang/translator_pd_pool.h
+++ b/src/lib/yang/translator_pd_pool.h
@@ -122,7 +122,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorPdPool(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorPdPool(S_Session session, const std::string& model);
@@ -189,7 +189,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorPdPools(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorPdPools(S_Session session, const std::string& model);

diff --git a/src/lib/yang/translator_pool.cc b/src/lib/yang/translator_pool.cc
index a5b6c0dc70057c83868d4748cbfb1ac55db770ed..199487a1533ab48bae6020b6edc02e0216c12eda 100644 (file)
--- a/src/lib/yang/translator_pool.cc
+++ b/src/lib/yang/translator_pool.cc
@@ -18,7 +18,7 @@ using namespace std;
 using namespace isc::data;
 using namespace isc::asiolink;
 using namespace isc::dhcp;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/translator_pool.h b/src/lib/yang/translator_pool.h
index aa92e73bb69816c722bc662d14a2505dc7377f9b..85ce580ebe1cf2bc1d686020f46c950097b6fe3b 100644 (file)
--- a/src/lib/yang/translator_pool.h
+++ b/src/lib/yang/translator_pool.h
@@ -130,7 +130,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorPool(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorPool(S_Session session, const std::string& model);
@@ -204,7 +204,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorPools(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorPools(S_Session session, const std::string& model);

diff --git a/src/lib/yang/translator_shared_network.cc b/src/lib/yang/translator_shared_network.cc
index fa152ce30de824c15334cf591ed540cef986b8b2..0774b8a9abf2b148cdfa5da6e52b4482066f9cbe 100644 (file)
--- a/src/lib/yang/translator_shared_network.cc
+++ b/src/lib/yang/translator_shared_network.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/translator_shared_network.h b/src/lib/yang/translator_shared_network.h
index 60628f2787664762af0d6ab5b359993af10eb3b5..f9141125cba9ace1ddbc6b2e02c24c6899cdb167 100644 (file)
--- a/src/lib/yang/translator_shared_network.h
+++ b/src/lib/yang/translator_shared_network.h
@@ -132,7 +132,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorSharedNetwork(sysrepo::S_Session session,
                             const std::string& model);
 #else
@@ -190,7 +190,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorSharedNetworks(sysrepo::S_Session session,
                              const std::string& model);
 #else

diff --git a/src/lib/yang/translator_subnet.cc b/src/lib/yang/translator_subnet.cc
index 9881e041c20d332b6ca296f84ee5dc81c057770a..c7849edf18bac322fbc97b983a9a93eb8308fe55 100644 (file)
--- a/src/lib/yang/translator_subnet.cc
+++ b/src/lib/yang/translator_subnet.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 

diff --git a/src/lib/yang/translator_subnet.h b/src/lib/yang/translator_subnet.h
index a44b155a9e294bc0460e331cd412af4cb08f927f..f1d5f835401a57f114b92490b3a926953541caa2 100644 (file)
--- a/src/lib/yang/translator_subnet.h
+++ b/src/lib/yang/translator_subnet.h
@@ -240,7 +240,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorSubnet(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorSubnet(S_Session session, const std::string& model);
@@ -303,7 +303,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorSubnets(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorSubnets(S_Session session, const std::string& model);