Browse Source

Update of pybind11 and progressBar for newer gcc

master
Trevor Irons 1 year ago
parent
commit
6284dc76cb

+ 1
- 1
CMake/SuperBuild.cmake View File

@@ -82,7 +82,7 @@ if (LEMMA_PYTHON3_BINDINGS)
82 82
 	#find_package(PythonLibs 3.0 REQUIRED)
83 83
         ExternalProject_Add(pybind11
84 84
 		    GIT_REPOSITORY "https://github.com/pybind/pybind11.git"
85
-		    GIT_TAG "v2.5.0" # "master" #"v2.4.3" #"master"
85
+		    GIT_TAG "v2.11.1" # "master" #"v2.4.3" #"master"
86 86
 		    UPDATE_COMMAND ""
87 87
 		    PATCH_COMMAND ""
88 88
     	    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/pybind11

+ 2
- 2
Modules/LemmaCore/include/ProgressBar.h View File

@@ -1,6 +1,7 @@
1 1
 #ifndef PROGRESS_BAR_H
2 2
 #define PROGRESS_BAR_H
3 3
 
4
+#include <stdint.h>
4 5
 #include <string>
5 6
 
6 7
 /**
@@ -16,8 +17,7 @@ public:
16 17
      * want to monitor and an initial message to be displayed on top of the bar
17 18
      * (which can be updated with updateLastPrintedMessage()).
18 19
      */
19
-    ProgressBar(
20
-            uint32_t expectedIterations, const std::string& initialMessage="");
20
+    ProgressBar(uint32_t expectedIterations, const std::string& initialMessage="");
21 21
 
22 22
     /**
23 23
      * Destructor to guarantee RAII.

+ 2
- 3
Modules/LemmaCore/src/ProgressBar.cpp View File

@@ -2,7 +2,7 @@
2 2
 #include <iostream>
3 3
 #include <iomanip>
4 4
 #include <sstream>
5
-#include <algorithm> 
5
+#include <algorithm>
6 6
 
7 7
 #define LENGTH_OF_PROGRESS_BAR 55
8 8
 #define PERCENTAGE_BIN_SIZE (100.0/LENGTH_OF_PROGRESS_BAR)
@@ -27,8 +27,7 @@ namespace
27 27
     }
28 28
 }
29 29
 
30
-ProgressBar::ProgressBar(
31
-            uint32_t expectedIterations, const std::string& initialMessage)
30
+ProgressBar::ProgressBar(uint32_t expectedIterations, const std::string& initialMessage)
32 31
     : mTotalIterations(expectedIterations),
33 32
       mNumberOfTicks(0),
34 33
       mEnded(false)

+ 1
- 1
python/setup.py View File

@@ -24,7 +24,7 @@ with open("README.md", "r") as fh:
24 24
 
25 25
 setup(
26 26
   name             = 'pyLemma',
27
-  version          = '0.4.0', 
27
+  version          = '0.4.1', 
28 28
   author           = 'Trevor Irons and others',
29 29
   author_email     = 'Trevor.Irons@lemmasoftware.org',
30 30
   description      = 'PyLemma is a wrapper to Lemma',

Loading…
Cancel
Save