Merge commit 'upstream/1.4.8'

Conflicts:
	debian/changelog
	debian/control
	debian/libconfig++9-dev.install
	debian/libconfig8.install
	debian/libconfig9-dev.install
	debian/rules

1 files changed, 0 insertions, 47 deletions

diff --git a/samples/c++/sample1.cpp b/samples/c++/sample1.cpp
deleted file mode 100644
index 7344838..0000000
--- a/samples/c++/sample1.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- ** Sample1
- ** Load sample.cfg and increment the "X" setting
- *************************************************************************/
-
-#include <iostream>
-#include <libconfig.h++>
-
-using namespace libconfig;
-using namespace std;
-
-/***************************************************************************/
-
-int main()
-{
-  Config cfg;
-
-  try
-  {
-    /* Load the configuration.. */
-    cout << "loading [sample.cfg]..";
-    cfg.readFile("sample.cfg");
-    cout << "ok" << endl;
-
-    /* Increment "x" */
-    cout << "increment \"x\"..";
-    Setting& s = cfg.lookup("x");
-    long x = s;
-    s = ++x;
-    cout << "ok (x=" << x << ")" << endl;
-
-    // Save the configuration
-    cout << "saving [sample.cfg]..";
-    cfg.writeFile("sample.cfg");
-    cout << "ok" << endl;
-
-    cout << "Done!" << endl;
-  }
-  catch (...)
-  {
-    cout << "failed" << endl;
-  }
-
-  return 0;
-}
-
-/***************************************************************************/